Преглед изворни кода

HUE-6787 [oozie] Hide calendar on modal close for any submit action

Enrico Berti пре 8 година
родитељ
комит
3e4ff16

+ 9 - 6
apps/oozie/src/oozie/templates/editor2/bundle_editor.mako

@@ -307,28 +307,31 @@ ${ utils.submit_popup_event() }
       $(this).parents(".controls").find("input[type='text']").val(moment().format("YYYY-MM-DD[T]HH:mm[Z]"));
     });
 
-    $(document).on("click", ".calendar-link", function(){
+    $(document).on("click", ".calendar-link", function () {
       var DATE_FORMAT = "YYYY-MM-DD";
       var _el = $(this).parents(".controls").find("input[type='text']");
       _el.off("keyup");
-      _el.on("keyup", function(){
+      _el.on("keyup", function () {
         _el.data("lastValue", _el.val());
       });
       _el.data("lastValue", _el.val());
       _el.datepicker({
         format: DATE_FORMAT.toLowerCase()
-       }).on("changeDate", function () {
+      }).on("changeDate", function () {
         _el.datepicker("hide");
       }).on("hide", function () {
         var _val = _el.data("lastValue") ? _el.data("lastValue") : _el.val();
-        if (_val.indexOf("T") == -1){
+        if (_val.indexOf("T") == -1) {
           _el.val(_el.val() + "T00:00Z");
         }
         else if (_el.val().indexOf("T") == "-1") {
-          _el.val(_el.val() + "T" +  _val.split("T")[1]);
+          _el.val(_el.val() + "T" + _val.split("T")[1]);
         }
       });
-     _el.datepicker('show');
+      _el.datepicker('show');
+      huePubSub.subscribeOnce('hide.datepicker', function () {
+        _el.datepicker('hide');
+      });
     });
 
     huePubSub.subscribe('submit.popup.return', function (data) {

+ 9 - 6
apps/oozie/src/oozie/templates/editor2/submit_job_popup.mako

@@ -135,28 +135,31 @@
     $(this).parents(".controls").find("input[type='text']").val(moment().format("YYYY-MM-DD[T]HH:mm"));
   });
 
-  $(".calendar-link").on("click", function(){
+  $(".calendar-link").on("click", function () {
     var DATE_FORMAT = "YYYY-MM-DD";
     var _el = $(this).parents(".controls").find("input[type='text']");
     _el.off("keyup");
-    _el.on("keyup", function(){
+    _el.on("keyup", function () {
       _el.data("lastValue", _el.val());
     });
     _el.data("lastValue", _el.val());
     _el.datepicker({
       format: DATE_FORMAT.toLowerCase()
-     }).on("changeDate", function () {
+    }).on("changeDate", function () {
       _el.datepicker("hide");
     }).on("hide", function () {
       var _val = _el.data("lastValue") ? _el.data("lastValue") : _el.val();
-      if (_val.indexOf("T") == -1){
+      if (_val.indexOf("T") == -1) {
         _el.val(_el.val() + "T00:00Z");
       }
       else if (_el.val().indexOf("T") == "-1") {
-        _el.val(_el.val() + "T" +  _val.split("T")[1]);
+        _el.val(_el.val() + "T" + _val.split("T")[1]);
       }
     });
-   _el.datepicker('show');
+    _el.datepicker('show');
+    huePubSub.subscribeOnce('hide.datepicker', function () {
+      _el.datepicker('hide');
+    });
   });
 
   % if return_json:

+ 3 - 0
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -587,6 +587,9 @@ function renderCrons() {
       $(document).on('showSubmitPopup', function (event, data) {
         $('.submit-modal').html(data);
         $('.submit-modal').modal('show');
+        $('.submit-modal').on('hidden', function () {
+          huePubSub.publish('hide.datepicker');
+        });
         var _sel = $('.submit-form .control-group[rel!="popover"]:visible');
         if (_sel.length > 0) {
           $('.submit-modal .modal-body').height($('.submit-modal .modal-body').height() + 60);

+ 3 - 0
desktop/libs/notebook/src/notebook/static/notebook/js/notebook.ko.js

@@ -2413,6 +2413,9 @@ var EditorViewModel = (function() {
                   $(document).on("showSubmitPopup", function (event, data) {
                     $('.submit-modal-editor').html(data);
                     $('.submit-modal-editor').modal('show');
+                    $('.submit-modal-editor').on('hidden', function () {
+                      huePubSub.publish('hide.datepicker');
+                    });
                     var _sel = $('.submit-form .control-group[rel!="popover"]:visible');
                     if (_sel.length > 0) {
                       $('.submit-modal-editor .modal-body').height($('.submit-modal-editor .modal-body').height() + 60);

+ 3 - 0
desktop/libs/notebook/src/notebook/templates/notebooks.mako

@@ -246,6 +246,9 @@ ${ commonshare() | n,unicode }
     $(document).on("showSubmitPopup", function(event, data){
       $('#submit-notebook-modal').html(data);
       $('#submit-notebook-modal').modal('show');
+      $('#submit-notebook-moda').on('hidden', function () {
+        huePubSub.publish('hide.datepicker');
+      });
     });
 
     var oTable = $("#notebookTable").dataTable({