Browse Source

[assist] Fix the spinner for the table tree

Johan Ahlen 10 years ago
parent
commit
94709d6611

+ 1 - 1
desktop/core/src/desktop/static/desktop/js/assist/assistEntry.js

@@ -127,9 +127,9 @@
       return;
     }
     self.loading(true);
-    self.entries([]);
 
     var successCallback = function(data) {
+      self.entries([]);
       if (typeof data.tables !== "undefined") {
         self.entries($.map(data.tables, function(tableName) {
           return self.createEntry({

+ 4 - 0
desktop/core/src/desktop/templates/assist.mako

@@ -160,6 +160,10 @@ from desktop.views import _ko
         <a class="assist-column-link" data-bind="multiClick: { click: toggleOpen, dblClick: dblClick }, attr: {'title': definition.title }, css: { 'assist-field-link': ! definition.isTable, 'assist-table-link': definition.isTable }" href="javascript:void(0)">
           <span draggable="true" data-bind="text: definition.displayName, draggableText: { text: editorText }"></span>
         </a>
+        <div class="center"  data-bind="visible: loading" style="display:none;">
+          <!--[if !IE]><!--><i class="fa fa-spinner fa-spin" style="font-size: 20px; color: #BBB"></i><!--<![endif]-->
+          <!--[if IE]><img src="${ static('desktop/art/spinner.gif') }"/><![endif]-->
+        </div>
         <!-- ko template: { if: open(), name: 'assist-entries'  } --><!-- /ko -->
       </li>
     </ul>