Browse Source

[oozie] Side drops have now 100% height

Enrico Berti 11 years ago
parent
commit
fdbd14bb52

+ 17 - 2
apps/oozie/src/oozie/templates/editor/workflow_editor.mako

@@ -846,12 +846,27 @@ ${ dashboard.import_bindings() }
   var _linkMappingTimeout = -1;
   $(document).on("drawArrows", function(){
     window.clearTimeout(_linkMappingTimeout);
-    _linkMappingTimeout = window.setTimeout(drawArrows, 25);
+    _linkMappingTimeout = window.setTimeout(renderChangeables, 25);
   });
 
   $(document).on("editingToggled", function(){
     $("canvas").remove();
-    window.setTimeout(drawArrows, 100);
+    window.setTimeout(renderChangeables, 100);
+  });
+
+  function resizeDrops() {
+    $(".drop-target-side").each(function () {
+      $(this).height($(this).parent().parent().innerHeight() - 12);
+    });
+  }
+
+  function renderChangeables() {
+    resizeDrops();
+    drawArrows();
+  }
+
+  $(document).ready(function(){
+    renderChangeables();
   });
 
 </script>

+ 1 - 0
apps/oozie/static/css/workflow-editor.css

@@ -313,6 +313,7 @@ em {
 
 .drop-target-side {
   min-height: 100px;
+  height: 100%;
 }
 
 .dashboard .row-fluid .span10.readonly {

+ 2 - 2
apps/oozie/static/js/workflow-editor.ko.js

@@ -215,7 +215,7 @@ var Workflow = function (vm, workflow) {
 
         // Added to the side ?
         if (vm.currentlyCreatingFork) {
-            var parentWidget = vm.getWidgetPredecessor(node.id()); alert(parentWidget.id());
+            var parentWidget = vm.getWidgetPredecessor(node.id()); console.log(parentWidget.id());
 
           if (self.getNodeById(parentWidget.id()) == null) { // New fork
         	
@@ -744,7 +744,7 @@ var WorkflowEditorViewModel = function (layout_json, workflow_json, credentials_
         "workflow": ko.mapping.toJSON(self.workflow)
     }, function (data) {
       if (data.status == 0) {
-        alert(data.xml);
+        console.log(data.xml);
       }
       else {
         $(document).trigger("error", data.message);