浏览代码

HUE-5907 [oozie] Loading a workflow misplaces the draggable icons toolbar

Enrico Berti 8 年之前
父节点
当前提交
5249fb68ed
共有 1 个文件被更改,包括 22 次插入8 次删除
  1. 22 8
      apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

+ 22 - 8
apps/oozie/src/oozie/templates/editor2/workflow_editor.mako

@@ -699,12 +699,6 @@ ${ dashboard.import_bindings() }
     viewModel.newAction(null);
   }
 
-  $(document).on("editingToggled", function(){
-    $("canvas").remove();
-    exposeOverlayClickHandler();
-    window.setTimeout(renderChangeables, 100);
-  });
-
   function resizeDrops() {
     $(".drop-target-side").each(function () {
       var _el = $(this);
@@ -816,6 +810,24 @@ ${ dashboard.import_bindings() }
   $(document).ready(function(){
     renderChangeables();
 
+    $(document).on("editingToggled", function () {
+      $("canvas").remove();
+      exposeOverlayClickHandler();
+      if (viewModel.isEditing()) {
+        hueUtils.waitForRendered('.card-toolbar-content', function (el) {
+          return el.height() > 40 && el.height() < 200
+        }, function () {
+          resizeToolbar();
+          renderChangeables();
+        });
+      }
+      else {
+        hueUtils.waitForRendered('.card-toolbar-content', function (el) {
+          return !el.is(':visible')
+        }, renderChangeables);
+      }
+    });
+
     function resizeToolbar() {
       $('.draggable-widget').css('width', '');
       $('.draggable-widget img').css({
@@ -832,11 +844,13 @@ ${ dashboard.import_bindings() }
           $('.draggable-widget .draggable-icon').css('fontSize', width / 2);
         }
       }
-      var marginLeft = $('.card-toolbar').width()/2 - $('.card-toolbar-content').width()/2;
+      var marginLeft = $('.card-toolbar').width() / 2 - $('.card-toolbar-content').width() / 2;
       $('.card-toolbar-content').css('marginLeft', marginLeft + 'px');
     }
 
-    hueUtils.waitForRendered('.card-toolbar', function(el){ return el.height() > 40 && el.height() < 200 }, resizeToolbar);
+    if (viewModel.isEditing()){
+      hueUtils.waitForRendered('.card-toolbar', function(el){ return el.height() > 40 && el.height() < 200 }, resizeToolbar);
+    }
 
     $(document).on("blur", "[validate]", function() {
       validateFields();