X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=dgbuilder%2Fnodes%2Fdge%2Fdgelogic%2Fblock.html;h=4e6d2b98382b7e8ddc8be5c6189a1f4a33132f2b;hp=fadf8a8c9da9f19ca41fdfe998b11cd5c114e081;hb=refs%2Fchanges%2F01%2F55501%2F1;hpb=e14a02086c9119532f9153c78346d5c1d6789ca9

diff --git a/dgbuilder/nodes/dge/dgelogic/block.html b/dgbuilder/nodes/dge/dgelogic/block.html
index fadf8a8c..4e6d2b98 100644
--- a/dgbuilder/nodes/dge/dgelogic/block.html
+++ b/dgbuilder/nodes/dge/dgelogic/block.html
@@ -107,10 +107,10 @@
             return this.name;
         },
         oneditprepare: function() {
+            var that = this;
             $( "#node-input-outputs" ).spinner({
                 min:1
             });
-
 	     var comments = $( "#node-input-comments").val();
 	     if(comments != null){
 		comments = comments.trim();
@@ -126,69 +126,72 @@
 			$('#node-input-atomic-chkBox').prop('checked', false);
 		}
 
-
-            function functionDialogResize(ev,ui) {
-                $("#node-input-xml-editor").css("height",(ui.size.height-275)+"px");
+            function functionDialogResize() {
+                var rows = $("#dialog-form>div:not(.node-text-editor-row)");
+                var height = $("#dialog-form").height();
+                for (var i=0;i<rows.size();i++) {
+                    height -= $(rows[i]).outerHeight(true);
+                }
+                var editorRow = $("#dialog-form>div.node-text-editor-row");
+                height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
+                $(".node-text-editor").css("height",height+"px");
+                that.editor.resize();
             };
-
-            $( "#dialog" ).dialog( "option", "width", 1200 );
-            $( "#dialog" ).dialog( "option", "height", 750 );
             $( "#dialog" ).on("dialogresize", functionDialogResize);
             $( "#dialog" ).one("dialogopen", function(ev) {
                 var size = $( "#dialog" ).dialog('option','sizeCache-function');
                 if (size) {
-                    functionDialogResize(null,{size:size});
+                    $("#dialog").dialog('option','width',size.width);
+                    $("#dialog").dialog('option','height',size.height);
+                    functionDialogResize();
                 }
             });
+            $( "#dialog" ).one("dialogclose", function(ev,ui) {
+                var height = $( "#dialog" ).dialog('option','height');
+                $( "#dialog" ).off("dialogresize",functionDialogResize);
+            });
 
+            this.editor = RED.editor.createEditor({
+                id: 'node-input-xml-editor',
+                mode: 'ace/mode/html'
+            });
+            this.editor.setValue($("#node-input-xml").val(),-1);
+		blockXmlEditor=that.editor;
+	/*	
+            RED.library.create({
+                url:"functions", // where to get the data from
+                type:"function", // the type of object the library is for
+                editor:this.editor, // the field name the main text body goes to
+                mode:"ace/mode/html",
+                fields:['name','outputs']
+            });
+	*/
+            this.editor.focus();
 	    /* close dialog when ESC is pressed and released */	
-            $( "#dialog" ).keyup(function(event){
+            $( "#node-input-xml-editor" ).keyup(function(event){
      		if(event.which == 27 ) {
             		$("#node-dialog-cancel").click();
 		}
  	    }); 
-
-            $( "#dialog" ).one("dialogclose", function(ev,ui) {
-                var height = $( "#dialog" ).dialog('option','height');
-                $( "#dialog" ).off("dialogresize",functionDialogResize);
-            });
-            var that = this;
-            require(["orion/editor/edit"], function(edit) {
-                that.editor = edit({
-                    parent:document.getElementById('node-input-xml-editor'),
-                    lang:"html",
-                    contents: $("#node-input-xml").val()
-                });
-		blockXmlEditor=that.editor;
-                RED.library.create({
-                    url:"functions", // where to get the data from
-                    type:"function", // the type of object the library is for
-                    editor:that.editor, // the field name the main text body goes to
-                    fields:['name','outputs']
-                });
-                $("#node-input-name").focus();
 		$("#node-input-validate").click(function(){
-				//console.log("validate clicked.");
+				console.log("validate clicked.");
 				//console.dir(that.editor);
 				//console.log("getText:" + that.editor.getText());
-				var val = that.editor.getText();
+				var val = that.editor.getValue();
 				validateXML(val); 
 		});
 		$("#node-input-show-sli-values").click(function(){
-				//console.log("SLIValues clicked.");
-				showValuesBox(that.editor,sliValuesObj);
+			//console.log("show Values clicked.");
+			showValuesBox(that.editor,sliValuesObj);
 		});
-
-            });
 	    //for click of add comments button
 	    $("#node-input-btnComments").click(function(e){
 			showCommentsBox();
 	    });	
-        },
+	},
         oneditsave: function() {
-		
-            $("#node-input-xml").val(this.editor.getText());
-		var resp=validateXML(this.editor.getText());
+            $("#node-input-xml").val(this.editor.getValue());
+		var resp=validateXML(this.editor.getValue());
 		if(resp){
 			this.status = {fill:"green",shape:"dot",text:"OK"};
 		}else{
@@ -196,26 +199,26 @@
 		}	
            	delete this.editor;
 		delete blockXmlEditor;
-        }
+	}
     });
 function updateXml(){
 	if($("#node-input-atomic-chkBox").is(':checked')){
 		$("#node-input-name").val("block : atomic");
 		$("#node-input-atomic").val("true");
 		//alert($("#node-input-xml-editor div.textview div.textviewContent").text());
-		var xmlStr = blockXmlEditor.getText();
+		var xmlStr = blockXmlEditor.getValue();
 		var re = new RegExp("<block[^<]+");
 		xmlStr=xmlStr.replace(re,"<block atomic='true'>");
 		//$("#node-input-xml-editor div.textview div.textviewContent").text(xmlStr);
-		blockXmlEditor.setText(xmlStr);
+		blockXmlEditor.setValue(xmlStr);
 		//console.log("block xmlStr:" + xmlStr);
 	}else{
 		$("#node-input-name").val("block");
 		$("#node-input-atomic").val("false");
-		var xmlStr = blockXmlEditor.getText();
+		var xmlStr = blockXmlEditor.getValue();
 		var re = new RegExp("<block[^<]+");
 		xmlStr=xmlStr.replace(re,"<block>");
-		blockXmlEditor.setText(xmlStr);
+		blockXmlEditor.setValue(xmlStr);
 		//$("#node-input-xml-editor div.textview div.textviewContent").text(xmlStr);
 		//console.log("block xmlStr:" + xmlStr);
 	}