瀏覽代碼

[search] Improved display of fixed time window

Added 'esc' keydown event to hide demi-dialogs
Enrico Berti 10 年之前
父節點
當前提交
95123bc

+ 7 - 0
apps/oozie/src/oozie/templates/editor2/bundle_editor.mako

@@ -224,6 +224,8 @@ ${ dashboard.import_bindings() }
 <script src="${ static('oozie/js/bundle-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
 
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
+
 
 <script type="text/javascript">
   var viewModel = new BundleEditorViewModel(${ bundle_json | n,unicode }, ${ coordinators_json | n,unicode }, ${ can_edit_json | n,unicode });
@@ -257,6 +259,11 @@ ${ dashboard.import_bindings() }
     $("#chooseCoordinatorDemiModal").modal({
       show: false
     });
+    $(window).bind("keydown", "esc", function () {
+      if ($(".demi-modal.fade.in").length > 0) {
+        $(".demi-modal.fade.in .demi-modal-chevron").click();
+      }
+    });
   });
 </script>
 

+ 7 - 0
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -536,6 +536,8 @@ ${ dashboard.import_bindings() }
 <script src="${ static('oozie/js/coordinator-editor.ko.js') }" type="text/javascript" charset="utf-8"></script>
 <script src="${ static('oozie/js/editor2-utils.js') }" type="text/javascript" charset="utf-8"></script>
 
+<script src="${ static('desktop/ext/js/jquery/plugins/jquery.hotkeys.js') }"></script>
+
 
 <script type="text/javascript">
   ${ utils.slaGlobal() }
@@ -655,6 +657,11 @@ ${ dashboard.import_bindings() }
     $("#chooseWorkflowDemiModal").modal({
       show: false
     });
+    $(window).bind("keydown", "esc", function () {
+      if ($(".demi-modal.fade.in").length > 0) {
+        $(".demi-modal.fade.in .demi-modal-chevron").click();
+      }
+    });
   });
 </script>
 

+ 7 - 5
apps/search/src/search/templates/search.mako

@@ -1608,13 +1608,10 @@ ${ dashboard.layout_skeleton() }
 
 <script type="text/html" id="time-fixed-filter">
   <span data-bind="visible: $root.availableDateFields().length > 0" class="muted" title="${ _('Time Settings') }" rel="tooltip" data-placement="bottom" data-toggle="modal" data-target="#timeSettingsDemiModal" style="cursor:pointer">
-    &nbsp;<span data-bind="text: moment($root.collection.timeFilter.from()).utc().format('YYYY-MM-DD HH:mm:SS')"></span>
+    &nbsp;
+    <span data-bind="text: moment($root.collection.timeFilter.from()).utc().format('YYYY-MM-DD HH:mm:SS')"></span>
     <i class="fa fa-long-arrow-right"></i>
     <span data-bind="text: moment($root.collection.timeFilter.to()).utc().format('YYYY-MM-DD HH:mm:SS')"></span>
-    &nbsp;
-    <a class="btn pointer" title="${ _('Time Settings') }" rel="tooltip" data-placement="bottom" data-toggle="modal" data-target="#timeSettingsDemiModal">
-      <i class="fa fa-calendar"></i>
-    </a>    
   </span>
 </script>
 
@@ -2308,6 +2305,11 @@ $(document).ready(function () {
     return false;
   });
   % endif
+  $(window).bind("keydown", "esc", function () {
+    if ($(".demi-modal.fade.in").length > 0) {
+      $(".demi-modal.fade.in .demi-modal-chevron").click();
+    }
+  });
 });
 
   function showShareModal() {