@sapui5/sap.rules.ui 1.107.0 → 1.108.1

package/src/sap/rules/ui/ExpressionAdvancedRenderer.js

@@ -5,7 +5,7 @@
 	
  */
 
-sap.ui.define(['jquery.sap.global'],
+sap.ui.define([],
     function() {
         "use strict";
 
@@ -13,7 +13,9 @@ sap.ui.define(['jquery.sap.global'],
          * ExpressionAdvanced renderer.
          * @namespace
          */
-        var ExpressionAdvancedRenderer = {};
+        var ExpressionAdvancedRenderer = {
+        		apiVersion: 2
+        };
 
         /*
          * Renders the HTML for the given control, using the provided
@@ -26,13 +28,11 @@ sap.ui.define(['jquery.sap.global'],
          *            the ExpressionAdvanced  to be rendered
          */
         ExpressionAdvancedRenderer.render = function(oRm, oExpressionAdvanced) {
-            oRm.write("<div");
-            oRm.writeControlData(oExpressionAdvanced);
-            oRm.addClass("sapRULExpressionAdvanced");
-            oRm.writeClasses();
-            oRm.write(">");
+        	oRm.openStart("div", oExpressionAdvanced);
+    		oRm.class("sapRULExpressionAdvanced");
+    		oRm.openEnd();
             oRm.renderControl(oExpressionAdvanced.getAggregation("_expressionArea"));
-            oRm.write("</div>");
+            oRm.close("div");
         };
 
     return ExpressionAdvancedRenderer;

package/src/sap/rules/ui/ExpressionBase.js

@@ -22,7 +22,7 @@ sap.ui.define([
     * @extends sap.ui.core.Control
     *
     * @author SAP SE
-    * @version 1.107.0
+    * @version 1.108.1
     *
     * @constructor
     * @private

package/src/sap/rules/ui/ExpressionBasic.js

@@ -10,8 +10,9 @@ sap.ui.define([
     "./library",
     "sap/ui/core/Control",
     "sap/rules/ui/InstructionRenderer",
-    "sap/rules/ui/ExpressionBase"
-], function(jQuery, library, Control, InstructionRenderer, ExpressionBase) {
+    "sap/rules/ui/ExpressionBase",
+    "./ExpressionBasicRenderer"
+], function(jQuery, library, Control, InstructionRenderer, ExpressionBase, ExpressionBasicRenderer) {
     "use strict";
 
     /**
@@ -25,7 +26,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.107.0
+     * @version 1.108.1
      *
      * @constructor
      * @private
@@ -322,7 +323,9 @@ sap.ui.define([
                 }
             }
             return false;
-        }
+        },
+        
+        renderer: ExpressionBasicRenderer
     });
 
     return ExpressionBasic;

package/src/sap/rules/ui/ExpressionBasicRenderer.js

@@ -5,7 +5,7 @@
 	
  */
 
-sap.ui.define(['jquery.sap.global'],
+sap.ui.define([],
     function() {
         "use strict";
 
@@ -13,7 +13,9 @@ sap.ui.define(['jquery.sap.global'],
          * ExpressionAdvanced renderer.
          * @namespace
          */
-        var ExpressionBasicRenderer = {};
+        var ExpressionBasicRenderer = {
+        		apiVersion: 2
+        };
 
         /*
          * Renders the HTML for the given control, using the provided
@@ -26,12 +28,11 @@ sap.ui.define(['jquery.sap.global'],
          *            the ExpressionBasic  to be rendered
          */
         ExpressionBasicRenderer.render = function(oRm, oExpressionBasic) {
-            oRm.write("<div");
-            oRm.writeControlData(oExpressionBasic);
-            oRm.writeClasses();
-            oRm.write(">");
+        	oRm.openStart("div", oExpressionBasic);
+    		oRm.class("sapRULTextRule");
+    		oRm.openEnd();
             oRm.renderControl(oExpressionBasic.getAggregation("_instructionRenderer"));
-            oRm.write("</div>");
+            oRm.close("div");
         };
 
         return ExpressionBasicRenderer;

package/src/sap/rules/ui/InstructionRenderer.js

@@ -128,39 +128,41 @@ sap.ui.define([
             }
         },
 
-        renderer: function(oRM, oControl) {
-            oRM.write("<div class='sapUiSizeCompact' ");
-            oRM.writeControlData(oControl);
-            oRM.write(">");
-
-            var controls = oControl.getAggregation("_content");
-            if (controls) {
-                if (oControl._getIndent()) {
-                    oRM.write(oControl._getTableStart());
-                }
-
-                for (var i = 0, len = controls.length; i < len; ++i) {
-
-                    var isLineBreakStart = oControl.lineBreakIndexes.start[i];
-                    var isLineBreakEnd = oControl.lineBreakIndexes.end[i];
-
-                    if (isLineBreakStart && oControl._getIndent()) {
-                        oRM.write(oControl._getLogicalOperatorStart());
-                    }
-
-                    oRM.renderControl(controls[i]);
-
-                    if (isLineBreakEnd && oControl._getIndent()) {
-                        oRM.write(oControl._getLogicalOperatorEnd());
-                    }
-                }
-
-                if (oControl._getIndent()) {
-                    oRM.write(oControl._getTableEnd());
-                }
-            }
-
-            oRM.write("</div>");
+        renderer: {
+        	apiVersion: 2,
+			render: function (oRM, oControl) {
+				oRM.openStart("div", oControl);
+	        	oRM.class("sapUiSizeCompact");
+	        	oRM.openEnd();
+	            var controls = oControl.getAggregation("_content");
+	            if (controls) {
+	                if (oControl._getIndent()) {
+	                    oControl._setTableStart(oRM, oControl)
+	                }
+
+	                for (var i = 0, len = controls.length; i < len; ++i) {
+
+	                    var isLineBreakStart = oControl.lineBreakIndexes.start[i];
+	                    var isLineBreakEnd = oControl.lineBreakIndexes.end[i];
+
+	                    if (isLineBreakStart && oControl._getIndent()) {
+	                        oControl._setLogicalOperatorStart(oRM, oControl);
+	                    }
+
+	                    oRM.renderControl(controls[i]);
+
+	                    if (isLineBreakEnd && oControl._getIndent()) {
+	                        oControl._setLogicalOperatorEnd(oRM, oControl);
+	                    }
+	                }
+
+	                if (oControl._getIndent()) {
+	                    oControl._setTableEnd(oRM, oControl);
+	                }
+	            }
+
+	            oRM.close("div");
+			}
         },
 
         /**
@@ -666,6 +668,44 @@ sap.ui.define([
             return ctrl;
         },
 
+        _setTableStart: function(oRM, oControl) {
+        	oRM.openStart("table", oControl);
+        	oRM.openEnd();
+        	oRM.openStart("td", oControl);
+        	oRM.openEnd();
+        	oRM.close("td");
+        	oRM.openStart("td", oControl);
+        	oRM.openEnd();
+        	oRm.class("sapRULExpressionBasicVerticalAlign");
+        	oRM.openEnd();
+        },
+
+        _setTableEnd: function(oRM, oControl) {
+        	oRm.close("td");
+        	oRm.close("tr");
+        	oRm.close("table");
+        },
+
+        _setLogicalOperatorStart: function(oRM, oControl) {
+        	oRM.openStart("div", oControl);
+        	oRm.class(this.LINE_GAP_CLASS);
+        	oRM.openEnd();
+        	oRm.close("td");
+        	oRm.close("tr");
+        	oRM.openStart("tr", oControl);
+        	oRM.openEnd();
+        	oRM.openStart("td", oControl);
+        	oRm.class("sapRULExpressionBasicVerticalAlign");
+        	oRM.openEnd();
+        },
+
+        _setLogicalOperatorEnd: function(oRM, oControl) {
+        	oRm.close("td");
+        	oRM.openStart("td", oControl);
+        	oRm.class("sapRULExpressionBasicVerticalAlign");
+        	oRM.openEnd();
+        },
+
         _getTableStart: function() {
             return '<table><td></td><td class="sapRULExpressionBasicVerticalAlign">';
         },

package/src/sap/rules/ui/RuleBase.js

@@ -24,7 +24,7 @@ sap.ui.define([
      * @extends  Control
      *
      * @author SAP SE
-     * @version 1.107.0
+     * @version 1.108.1
      *
      * @constructor
      * @private