loads table list on click of addTable btn ; Fade effects.

swapnilmj · Jul 27, 2012 · 69b970b · 69b970b
1 parent 83413de
commit 69b970b
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 53 deletions.
diff --git a/coffee/design.coffee b/coffee/design.coffee
@@ -11,9 +11,6 @@ $ ->
                               $(this).addClass('selected')
 
                             if $('#right-pane').hasClass('results-mode')
-                              #fillResultData($('.output pre').html())
-                              #sqlOut="SELECT * FROM mDC"
-                              #sqlOut = $('.output pre').html()
                               sqlOut = QueryMaint.getSQL()
                               fillResultData(sqlOut)
 
@@ -29,7 +26,6 @@ $ ->
         $('#results-pane').html(html)
       )
 
-  #$('#design-results-btns .results-mode').on('clic)'clic
 
   #set design-mode as default
   $('#design-results-btns .design-mode').trigger('click')
@@ -55,34 +51,21 @@ $ ->
 
               else  #input
                 #hide input
-                #SQLDataRestorer.init(0, newSQL)
                 newSQL = $('#sql-text-ip').val()
                 SQLDataRestorer.init(0, newSQL)
                 #change btn label to Edit SQL
                 $(this).html('Edit SQL')
 
               $('#sql-out').toggleClass 'output-mode input-mode'           
 
-  ###
-  $('#pane-where textarea')
-      .on 'blur', (event)->
-        SQLPaneView.render()
-  ###
   $('select[name=schema]')
       .on 'blur', (evt)->
         schema = $(evt.target).val()
-        #$.cookie 'schema', schema
-        #$.ajax({
-        #  url:"ajax/table_list.php"
-        #  data:{ schema: schema }
-        #  cache:false
-        #}).done( (html) ->
-        #  $('#table-list').html(html)
-        #  bindAddTableEvts()
-        #)
-        LoadTableList schema
+        if $('select[name=schema]').val() == ""
+          App.reset()
 
-  window.LoadTableList = (schema)->
+  window.LoadTableList = (schema)->      
+        if $.cookie('schema') == schema then return   #no loading required
         $.cookie 'schema', schema
         $.ajax({
           url:"ajax/table_list.php"
@@ -93,15 +76,25 @@ $ ->
           bindAddTableEvts()
         )
 
+
   $('#pane-where textarea')
     .on 'keyup', _.debounce(
       (event) -> SQLPaneView.render(),
       500)
 
-  $('#pane-where textarea')
-    .on 'blur', (event)->
-      SQLPaneView.render()
-
-  LoadTableList $('select[name=schema]').val()
+  window.App = {
+        reset : ->
+          $('select[name=schema]').val("")
+          if localStorage then localStorage.clear()
+          setAppVisibility()
+          SQLPaneView.render()
+
+        setAppVisibility : ->
+          #sets visibility of all but basic (top) ctrls
+          show = $('select[name=schema]').val() != ""
+          if show
+            $('.pane').fadeIn(500)
+          else
+            $('.pane').fadeOut(0)
 
-        
+  }
diff --git a/coffee/design.js b/coffee/design.js
@@ -45,17 +45,13 @@ $(function() {
     }
     return $('#sql-out').toggleClass('output-mode input-mode');
   });
-  /*
-    $('#pane-where textarea')
-        .on 'blur', (event)->
-          SQLPaneView.render()
-  */
   $('select[name=schema]').on('blur', function(evt) {
     var schema;
     schema = $(evt.target).val();
-    return LoadTableList(schema);
+    if ($('select[name=schema]').val() === "") return App.reset();
   });
   window.LoadTableList = function(schema) {
+    if ($.cookie('schema') === schema) return;
     $.cookie('schema', schema);
     return $.ajax({
       url: "ajax/table_list.php",
@@ -71,8 +67,21 @@ $(function() {
   $('#pane-where textarea').on('keyup', _.debounce(function(event) {
     return SQLPaneView.render();
   }, 500));
-  $('#pane-where textarea').on('blur', function(event) {
-    return SQLPaneView.render();
-  });
-  return LoadTableList($('select[name=schema]').val());
+  return window.App = {
+    reset: function() {
+      $('select[name=schema]').val("");
+      if (localStorage) localStorage.clear();
+      setAppVisibility();
+      return SQLPaneView.render();
+    },
+    setAppVisibility: function() {
+      var show;
+      show = $('select[name=schema]').val() !== "";
+      if (show) {
+        return $('.pane').fadeIn(500);
+      } else {
+        return $('.pane').fadeOut(0);
+      }
+    }
+  };
 });
diff --git a/index.php b/index.php
@@ -66,8 +66,7 @@
 
         window.swapnil = {};
         $(function(){
-				//showTableList(false);
-						if(localStorage) localStorage.clear();
+					 if(localStorage) localStorage.clear();
 
 			     $('.btn-refresh').click(function () {
                     $('.output > pre').html(QueryBuilder.GenerateSQL()); 
@@ -76,6 +75,8 @@
                 $('.bool.expr').draggable({
                         helper:'clone'
                 });
+						App.setAppVisibility();
+						bindAddTableEvts();
 		})
 	</script>
 </head>
@@ -93,7 +94,7 @@
 				<span style="float: left;">
 				Schema : 
 				<select name="schema" >
-					<option value="" > --Select-- </option>
+					<option value="" > -- Select schema -- </option>
 
 					<?php
 
@@ -148,7 +149,6 @@
 		</div>
 		<div id="table-list">
 
-
 		</div>	
 			<div id="table-btns">
 				<span class="butn ok">

diff --git a/js/tbl-selection.js b/js/tbl-selection.js
@@ -13,18 +13,18 @@ $( function(){
 			}
 
       window.bindAddTableEvts = function(){
-          $('#table-btns .ok').on('click', function(event){
-               $('#table-list .selected').each( function(i){
-            							 //continue only if it is not added
-                             if(! $(this).hasClass('added')){
-                                    var tblName = $.trim($(this).html());
-                                    AddTable(tblName);
-                                    $(this).addClass('added');
-                             }
-                        } )
-                                
-                      showTableList(false);
-                    })
+        $('#table-btns .ok').on('click', function(event){
+            App.setAppVisibility();
+          $('#table-list .selected').each( function(i){
+            //continue only if it is not added
+            if(! $(this).hasClass('added')){
+              var tblName = $.trim($(this).html());
+              AddTable(tblName);
+              $(this).addClass('added');
+            }
+          })
+          showTableList(false);
+         })
 
                   $('#table-btns .cancel').on('click', function(event){
                           showTableList(false);
@@ -36,6 +36,12 @@ $( function(){
                   })
 
                   $('#btn-add-table').on('click', function(event){
+                              schema = $('select[name=schema]').val()
+                              if(schema == ""){
+                                    alert("Select a schema and then add tables")
+                                    return
+                              }
+                              LoadTableList(schema);
                               showTableList(true);
 
                   });