@sapui5/sap.rules.ui 1.107.0 → 1.108.1

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

@@ -10,8 +10,9 @@ sap.ui.define([
     "jquery.sap.global",
     "./library",
     "sap/rules/ui/ExpressionBasic",
-    "sap/rules/ui/InstructionRenderer"
-], function(jQuery, library, ExpressionBasic, InstructionRenderer) {
+    "sap/rules/ui/InstructionRenderer",
+    "./DecisionTableCellExpressionBasicRenderer"
+], function(jQuery, library, ExpressionBasic, InstructionRenderer, DecisionTableCellExpressionBasicRenderer) {
     "use strict";
 
     /**
@@ -25,7 +26,7 @@ sap.ui.define([
      * @extends  sap.rules.ui.ExpressionBasic
      *
      * @author SAP SE
-     * @version 1.107.0
+     * @version 1.108.1
      *
      * @constructor
      * @private
@@ -150,7 +151,9 @@ sap.ui.define([
         },
         _onChangeByIndex: function(instructionIndex, sPrefix) {
             sap.rules.ui.ExpressionBasic.prototype._onChangeByIndex.apply(this, [this.offSet + instructionIndex, this.sHeaderValue + this.FixedOperatorValue, instructionIndex]);
-        }
+        },
+        
+        renderer: DecisionTableCellExpressionBasicRenderer
     });
 
     DecisionTableCellExpressionBasic.prototype.init = function() {
@@ -168,12 +171,14 @@ sap.ui.define([
     DecisionTableCellExpressionBasic.prototype.onAfterRendering = function() {
         sap.rules.ui.ExpressionBasic.prototype.onAfterRendering.apply(this, arguments);
         this._calculateOffSet();
-		this.oDecisionTableCell = (this.getParent() && this.getParent().getParent()) ? this.getParent().getParent() : null;
-		var valueStatePath = this.oDecisionTableCell.getValueStatePath();
-		var dtModel = this.oDecisionTableCell.getModel("dtModel");
-		this.setProperty("valueStateText", "");
-		dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
-		this.createEventListeners();
+        this.oDecisionTableCell = (this.getParent() && this.getParent().getParent()) ? this.getParent().getParent() : null;
+        if (this.oDecisionTableCell) {
+        	var valueStatePath = this.oDecisionTableCell.getValueStatePath();
+    		var dtModel = this.oDecisionTableCell.getModel("dtModel");
+    		this.setProperty("valueStateText", "");
+    		dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+    		this.createEventListeners();
+        }
     };
 
     DecisionTableCellExpressionBasic.prototype.onBeforeRendering = function() {
@@ -222,18 +227,20 @@ sap.ui.define([
                     }
                 }.bind(this));
             }
-			var valueStateTextPath = this.oDecisionTableCell.getValueStateTextPath();
-			var valueStatePath = this.oDecisionTableCell.getValueStatePath();
-			var dtModel = this.oDecisionTableCell.getModel("dtModel");
-            if (oResult.status === sap.rules.ui.ValidationStatus.Error) {
-				errorDetails = oResult.errorDetails.replace(/\r\n/g, " ").replace(/\r/g, " ").replace(/\n/g, " ");
-				this.setProperty("valueStateText", errorDetails);
-				dtModel.setProperty(valueStateTextPath.slice(8), errorDetails);
-				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.Error);
-			} else {
-                this.setProperty("valueStateText", "");
-				dtModel.setProperty(valueStateTextPath.slice(8), "null");
-				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+            if (this.oDecisionTableCell) {
+            	var valueStateTextPath = this.oDecisionTableCell.getValueStateTextPath();
+    			var valueStatePath = this.oDecisionTableCell.getValueStatePath();
+    			var dtModel = this.oDecisionTableCell.getModel("dtModel");
+                if (oResult.status === sap.rules.ui.ValidationStatus.Error) {
+    				errorDetails = oResult.errorDetails.replace(/\r\n/g, " ").replace(/\r/g, " ").replace(/\n/g, " ");
+    				this.setProperty("valueStateText", errorDetails);
+    				dtModel.setProperty(valueStateTextPath.slice(8), errorDetails);
+    				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.Error);
+    			} else {
+                    this.setProperty("valueStateText", "");
+    				dtModel.setProperty(valueStateTextPath.slice(8), "null");
+    				dtModel.setProperty(valueStatePath.slice(8), sap.ui.core.ValueState.None);
+                }
             }
         }
     };

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

@@ -6,16 +6,18 @@
  */
 
 
-sap.ui.define(['jquery.sap.global', 'sap/rules/ui/ExpressionBasicRenderer'],
+sap.ui.define(['sap/rules/ui/ExpressionBasicRenderer'],
 
-    function(jQuery, sapRulesUiExpressionBasicRenderer) {
+    function(sapRulesUiExpressionBasicRenderer) {
         "use strict";
 
         /**
          * DecisionTableCellExpressionBasic  renderer.
          * @namespace
          */
-        var DecisionTableCellExpressionBasicRenderer = {};
+        var DecisionTableCellExpressionBasicRenderer = {
+        		apiVersion: 2
+        };
         /**
          * Renders the HTML for the given control, using the provided
          * {@link sap.ui.core.RenderManager}.
@@ -32,7 +34,7 @@ sap.ui.define(['jquery.sap.global', 'sap/rules/ui/ExpressionBasicRenderer'],
                 return;
             }
 
-            oRm.addClass("sapRULTDecisionTableCellExpressionBasic");
+            oRm.class("sapRULTDecisionTableCellExpressionBasic");
 
             sapRulesUiExpressionBasicRenderer.render(oRm, oControl);
         };

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

@@ -5,16 +5,18 @@
 	
  */
 
-sap.ui.define(['jquery.sap.global'],
+sap.ui.define([],
 
-	function(jQuery) {
+	function() {
 		"use strict";
 
 		/**
 		 * DecisionTableCellExpressionAdvanced renderer.
 		 * @namespace
 		 */
-		var DecisionTableCellRenderer = {};
+		var DecisionTableCellRenderer = {
+				apiVersion: 2
+		};
 		/**
 		 * Renders the HTML for the given control, using the provided
 		 * {@link sap.ui.core.RenderManager}.
@@ -31,13 +33,11 @@ sap.ui.define(['jquery.sap.global'],
 				return;
 			}
 
-            oRm.write("<div");
-            oRm.writeControlData(oControl);
-            oRm.addClass("sapRULDecisionTableSCell");
-            oRm.writeClasses();
-            oRm.write(">");
-            oRm.renderControl(oControl.getAggregation("_displayedControl"));
-            oRm.write("</div>");
+			oRm.openStart("div", oControl);
+			oRm.class("sapRULDecisionTableSCell");
+			oRm.openEnd();
+			oRm.renderControl(oControl.getAggregation("_displayedControl"));
+			oRm.close("div");
 		};
 
 		return DecisionTableCellRenderer;

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

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

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

@@ -1,165 +1,167 @@
-/*!
+/*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
 
 		(c) Copyright 2009-2016 SAP SE. All rights reserved
-	
- */
-
-sap.ui.define([
-    "jquery.sap.global"
-],  function(jQuery) {
-		"use strict";
-
-	/**
-	 * OdataDecisionTable renderer.
-	 * @namespace
-	 */
-	var DecisionTableRenderer = {};
-
-	/**
-	 * Renders the HTML for the given control, using the provided
-	 * {@link sap.ui.core.RenderManager}.
-	 *
-	 * @param {sap.ui.core.RenderManager} oRm
-	 *            the RenderManager that can be used for writing to
-	 *            the Render-Output-Buffer
-	 * @param {sap.ui.core.Control} oControl
-	 *            the control to be rendered
-	 */
-	DecisionTableRenderer.render = function(oRm, oControl) {
-
-		//oRm.addClass("sapUiSizeCozy");
-		if (oControl.getParent() instanceof jQuery){
-			jQuery.sap.syncStyleClass("sapUiSizeCozy", oControl.getParent(), this.oControl);
-		}
-
-		var bAccessibility = sap.ui.getCore().getConfiguration().getAccessibility();
-			
-		oRm.write("<div");
-		oRm.writeControlData(oControl);
-		oRm.addClass("sapRULDecisionTable");
-		oRm.writeClasses();
-		// some controls need to have accessibility attributes applied one level up than the input
-		this.writeAccAttributes(oRm, oControl);
-		
-
-		// accessibility states
-		if (bAccessibility) {
-			this.writeAccessibilityState(oRm, oControl);
-		}
-
-		oRm.write(">");
-		
-        oRm.renderControl(oControl.getAggregation("_toolbar"));
-		oRm.renderControl(oControl.getAggregation("_errorsText"));
-        oRm.renderControl(oControl.getAggregation("_table"));
-		// finish outer
-		oRm.write("</div>");
-		
-	};
-
-	/**
-	 * Writes the accessibility state of the control.
-	 * Hook for the subclasses.
-	 *
-	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
-	 */
-	DecisionTableRenderer.writeAccessibilityState = function(oRm, oControl) {
-		oRm.writeAccessibilityState(oControl, this.getAccessibilityState(oControl));
-	};
-
-	/**
-	 * Returns the accessibility state of the control.
-	 * Hook for the subclasses.
-	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control.
-	 * @returns {Object}
-	 */
-	DecisionTableRenderer.getAccessibilityState = function(oControl) {
-		    var sAriaRoleDescription = this.getRoleDescription(oControl),
-			sRole = this.getAriaRole(oControl),
-		    mAccessibilityState = { };
-
-			if (sRole) {
-				mAccessibilityState.role = sRole;
-			}
-
-			if (sAriaRoleDescription) {
-				mAccessibilityState.roledescription = {
-					value: sAriaRoleDescription.trim(),
-					append: true
-				};
-			}
-
-		return mAccessibilityState;
-	};
-
-	/**
-	 * Returns aria accessibility role for the control.
-	 * Hook for the subclasses.
-	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control
-	 * @returns {String}
-	 */
-	DecisionTableRenderer.getAriaRole = function(oControl) {
-		return "grid";
-	};
-
-	DecisionTableRenderer.getRoleDescription = function(oControl) {
-		this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-		return this.oBundle.getText("decisionTableReadOutString");
-    };
-
-	/**
-	 * This method is reserved for derived class to add extra attributes for the container one level upper of input.
-	 *
-	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
-	 */
-	DecisionTableRenderer.writeAccAttributes = function(oRm, oControl) {};
-
-	/**
-	 * Renders the hidden aria labelledby node for the accessibility.
-	 * Hook for the subclasses.
-	 *
-	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
-	 */
-	DecisionTableRenderer.renderAriaRoleDescription = function(oRm, oControl) {
-		var sAnnouncement = this.getDescribedByAnnouncement(oControl);
-		if (sAnnouncement) {
-			oRm.write("<span");
-			oRm.writeAttribute("id", oControl.getId() + "-roledescription");
-			oRm.writeAttribute("aria-hidden", "true");
-			oRm.addClass("sapUiInvisibleText");
-			oRm.writeClasses();
-			oRm.write(">");
-			oRm.writeEscaped(sAnnouncement.trim());
-			oRm.write("</span>");
-		}
-	};
-
-
-	/**
-	 * This method is reserved for derived class to add extra attributes for input container.
-	 *
-	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
-	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
-	 */
-	DecisionTableRenderer.writeOuterAttributes = function(oRm, oControl) {};
-
-	/**
-	 * Returns the inner aria describedby announcement texts for the accessibility.
-	 * Hook for the subclasses.
-	 *
-	 * @param {sap.ui.core.Control} oControl an object representation of the control.
-	 * @returns {String}
-	 */
-	DecisionTableRenderer.getDescribedByAnnouncement = function(oControl) {
-		return "";
-	};
-
-	return DecisionTableRenderer;
-
+	
+ */
+
+sap.ui.define([
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/Configuration",
+	"sap/ui/core/syncStyleClass"
+],  function(jQuery, Configuration, syncStyleClass) {
+		"use strict";
+
+	/**
+	 * OdataDecisionTable renderer.
+	 * @namespace
+	 */
+	var DecisionTableRenderer = {
+			apiVersion: 2
+	};
+
+	/**
+	 * Renders the HTML for the given control, using the provided
+	 * {@link sap.ui.core.RenderManager}.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm
+	 *            the RenderManager that can be used for writing to
+	 *            the Render-Output-Buffer
+	 * @param {sap.ui.core.Control} oControl
+	 *            the control to be rendered
+	 */
+	DecisionTableRenderer.render = function(oRm, oControl) {
+
+		//oRm.addClass("sapUiSizeCozy");
+		if (oControl.getParent() instanceof jQuery){
+			syncStyleClass("sapUiSizeCozy", oControl.getParent(), this.oControl);
+		}
+
+		var bAccessibility = Configuration.getAccessibility();
+			
+		oRm.openStart("div", oControl);
+		oRm.class("sapRULDecisionTable");
+		// some controls need to have accessibility attributes applied one level up than the input
+		this.writeAccAttributes(oRm, oControl);
+		
+
+		// accessibility states
+		if (bAccessibility) {
+			this.writeAccessibilityState(oRm, oControl);
+		}
+
+		oRm.openEnd();
+		
+        oRm.renderControl(oControl.getAggregation("_toolbar"));
+		oRm.renderControl(oControl.getAggregation("_errorsText"));
+        oRm.renderControl(oControl.getAggregation("_table"));
+		// finish outer
+        oRm.close("div");
+		
+	};
+
+	/**
+	 * Writes the accessibility state of the control.
+	 * Hook for the subclasses.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
+	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
+	 */
+	DecisionTableRenderer.writeAccessibilityState = function(oRm, oControl) {
+		oRm.accessibilityState(oControl, this.getAccessibilityState(oControl));
+	};
+
+	/**
+	 * Returns the accessibility state of the control.
+	 * Hook for the subclasses.
+	 *
+	 * @param {sap.ui.core.Control} oControl an object representation of the control.
+	 * @returns {Object}
+	 */
+	DecisionTableRenderer.getAccessibilityState = function(oControl) {
+		    var sAriaRoleDescription = this.getRoleDescription(oControl),
+			sRole = this.getAriaRole(oControl),
+		    mAccessibilityState = { };
+
+			if (sRole) {
+				mAccessibilityState.role = sRole;
+			}
+
+			if (sAriaRoleDescription) {
+				mAccessibilityState.roledescription = {
+					value: sAriaRoleDescription.trim(),
+					append: true
+				};
+			}
+
+		return mAccessibilityState;
+	};
+
+	/**
+	 * Returns aria accessibility role for the control.
+	 * Hook for the subclasses.
+	 *
+	 * @param {sap.ui.core.Control} oControl an object representation of the control
+	 * @returns {String}
+	 */
+	DecisionTableRenderer.getAriaRole = function(oControl) {
+		return "grid";
+	};
+
+	DecisionTableRenderer.getRoleDescription = function(oControl) {
+		this.oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		return this.oBundle.getText("decisionTableReadOutString");
+    };
+
+	/**
+	 * This method is reserved for derived class to add extra attributes for the container one level upper of input.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
+	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
+	 */
+	DecisionTableRenderer.writeAccAttributes = function(oRm, oControl) {};
+
+	/**
+	 * Renders the hidden aria labelledby node for the accessibility.
+	 * Hook for the subclasses.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
+	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
+	 */
+	DecisionTableRenderer.renderAriaRoleDescription = function(oRm, oControl) {
+		var sAnnouncement = this.getDescribedByAnnouncement(oControl);
+		if (sAnnouncement) {
+			
+			oRm.openStart("span", oControl);
+			oRm.attr("id", oControl.getId() + "-roledescription");
+			oRm.attr("aria-hidden", "true");
+			oRm.class("sapUiInvisibleText");
+			oRm.openEnd();
+			oRm.text(sAnnouncement.trim());
+			oRm.close("span");
+		}
+	};
+
+
+	/**
+	 * This method is reserved for derived class to add extra attributes for input container.
+	 *
+	 * @param {sap.ui.core.RenderManager} oRm The RenderManager that can be used for writing to the render output buffer.
+	 * @param {sap.ui.core.Control} oControl An object representation of the control that should be rendered.
+	 */
+	DecisionTableRenderer.writeOuterAttributes = function(oRm, oControl) {};
+
+	/**
+	 * Returns the inner aria describedby announcement texts for the accessibility.
+	 * Hook for the subclasses.
+	 *
+	 * @param {sap.ui.core.Control} oControl an object representation of the control.
+	 * @returns {String}
+	 */
+	DecisionTableRenderer.getDescribedByAnnouncement = function(oControl) {
+		return "";
+	};
+
+	return DecisionTableRenderer;
+
 }, /* bExport= */ true);

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

@@ -27,10 +27,11 @@ sap.ui.define([
         "sap/rules/ui/Constants",
         "sap/rules/ui/AstExpressionBasic",
         "sap/rules/ui/services/AstExpressionLanguage",
-        "sap/rules/ui/ast/util/AstUtil"
+        "sap/rules/ui/ast/util/AstUtil",
+        "./DecisionTableSettingsRenderer"
     ],
     function (jQuery, library, Control, SimpleForm, Label, Switch, Select, MessageBox, Table, Text, CheckBox, Input, Button,
-        ExpressionAdvanced, VerticalLayout, ExpressionType, Constants, AstExpressionBasic, AstExpressionLanguage, AstUtil) {
+        ExpressionAdvanced, VerticalLayout, ExpressionType, Constants, AstExpressionBasic, AstExpressionLanguage, AstUtil, DecisionTableSettingsRenderer) {
         "use strict";
 
         /**
@@ -43,7 +44,7 @@ sap.ui.define([
          * @extends  Control
          *
          * @author SAP SE
-         * @version 1.107.0
+         * @version 1.108.1
          *
          * @constructor
          * @private
@@ -100,7 +101,8 @@ sap.ui.define([
                 },
                 events: {},
                 publicMethods: []
-            }
+            },
+            renderer: DecisionTableSettingsRenderer
         });
 
         sap.rules.ui.DecisionTableSettings.prototype._addColumnToJsonModel = function (sequence) {