Browse Source

[core] Add deferred updates to Spark and fix for Oozie

Enrico Berti 10 years ago
parent
commit
2dc6b41

+ 1 - 1
apps/search/src/search/templates/search.mako

@@ -1797,7 +1797,7 @@ ${ dashboard.layout_skeleton() }
 
 <script src="${ static('desktop/ext/js/moment-with-locales.min.js') }" type="text/javascript" charset="utf-8"></script>
 
-${ dashboard.import_layout() }
+${ dashboard.import_layout(True) }
 
 <script src="${ static('search/js/search.utils.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('search/js/lzstring.min.js') }" type="text/javascript" charset="utf-8"></script>

+ 1 - 0
apps/spark/src/spark/templates/editor.mako

@@ -68,6 +68,7 @@ ${ commonheader(_('Query'), app_name, user, "68px") | n,unicode }
 <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/knockout-mapping.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }" type="text/javascript" charset="utf-8"></script>
+<script src="${ static('desktop/ext/js/knockout-deferred-updates.min.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/ko.editable.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('desktop/js/hue.utils.js') }"></script>
 <script src="${ static('desktop/js/ko.hue-bindings.js') }" type="text/javascript" charset="utf-8"></script>

+ 3 - 1
desktop/core/src/desktop/templates/common_dashboard.mako

@@ -25,14 +25,16 @@
   from django.utils.translation import ugettext as _
 %>
 
-<%def name="import_layout()">
+<%def name="import_layout(with_deferred=False)">
   <link rel="stylesheet" href="${ static('desktop/css/common_dashboard.css') }">
   <script src="${ static('desktop/js/ko.common-dashboard.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery-ui-1.10.4.draggable-droppable-sortable.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/knockout.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/knockout-mapping.min.js') }" type="text/javascript" charset="utf-8"></script>
   <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }" type="text/javascript" charset="utf-8"></script>
+  %if with_deferred:
   <script src="${ static('desktop/ext/js/knockout-deferred-updates.min.js') }" type="text/javascript" charset="utf-8"></script>
+  %endif
 </%def>
 
 <%def name="layout_toolbar()">