@sapui5/sap.rules.ui 1.106.0 → 1.108.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.rules.ui",
-  "version": "1.106.0",
+  "version": "1.108.0",
   "description": "SAPUI5 Library sap.rules.ui",
   "homepage": "https://sap.github.io/ui5-tooling/pages/SAPUI5/",
   "author": "SAP SE (https://www.sap.com)",

package/src/sap/rules/ui/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2016 SAP SE. All rights reserved
 	</copyright>
-	<version>1.106.0</version>
+	<version>1.108.0</version>
 
 	<documentation>UI5 library: sap.rules.ui</documentation>
 

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

@@ -22,11 +22,12 @@ sap.ui.define([
 	"sap/rules/ui/ast/provider/TermsProvider",
 	"sap/rules/ui/ast/parser/bundlelibrary",
 	"sap/ui/core/LocaleData",
-	"sap/rules/ui/ast/util/LoopFunctionDialog"
+	"sap/rules/ui/ast/util/LoopFunctionDialog",
+	"./AstExpressionBasicRenderer"
 	
 ], function (Log, jQuery, library, Control, ResponsivePopover, List, JSONModel, ListMode, PlacementType, StandardListItem, CustomData, Sorter,
 	infraUtils, AstExpressionLanguage, ExpressionAdvanced, AutoCompleteSuggestionContent, ExpressionBase, Constants, AggregateFunctionDialog,
-	SelectFunctionDialog, TermsProvider, astBundleLibrary, LocaleData, LoopFunctionDialog) {
+	SelectFunctionDialog, TermsProvider, astBundleLibrary, LocaleData, LoopFunctionDialog, AstExpressionBasicRenderer) {
 	"use strict";
 
 	var AstExpressionBasic = ExpressionBase.extend("sap.rules.ui.AstExpressionBasic", {
@@ -916,10 +917,15 @@ sap.ui.define([
 					119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135
 				]; //Non printable keys refer https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/keyCode
 
+			this.aKeyTracker = [];
 			if (!this._focusedOut) {
 				that._setCurrentCursorPosition(that._cursorPostion);
 			}
 			this._input.on('keydown', function (event) {
+				if(event.key != "Tab"){
+					that.aKeyTracker.push({key:event.key, keyCode:event.keyCode, pressed: true});
+				}
+				
 				//Handling for Arrow Up and Arrow Down to navigate to Autosuggest popup
 				if (event.keyCode === 8 || event.keyCode == 46) { // BackSpace Keyup event handling 
 					that._selectedSpans = that._getSelectedSpans();
@@ -946,6 +952,14 @@ sap.ui.define([
 					that.shiftKey = event.key;
 					that.bShiftPressed = false;
 				} else if (event.key === "Tab" || event.keyCode === 27) { 
+					var iIndex = that.aKeyTracker.findIndex(function (oItem) { return oItem.pressed === true; });
+					if ( iIndex !== -1) {
+						var e = jQuery.Event('keyup');
+						e.which = that.aKeyTracker[iIndex];
+						e.key = that.aKeyTracker[iIndex].key;
+						e.keyCode = that.aKeyTracker[iIndex].keyCode;
+						$this.trigger(e);
+					}
 					that._closeAutoSuggestionPopup();
 				} else if (keyCodes.indexOf(event.keyCode) !== -1 && event.keyCode !== 35 && event.keyCode !== 36 && event.keyCode !== 37 &&
 					event.keyCode !== 39) { //Keys in order: End, Home, Arrow Left, Arrow Right
@@ -988,6 +1002,10 @@ sap.ui.define([
 			});
 
 			this._input.on('keyup', function (event) {
+				if (event.key != "Tab") {
+					var iKeydownIndex = that.aKeyTracker.findIndex(function(oItem){return oItem.keyCode == event.keyCode});
+					that.aKeyTracker.splice(iKeydownIndex,1);
+				}
 				var context = jQuery(this);
 				var bPrintable = false;
 
@@ -1207,6 +1225,9 @@ sap.ui.define([
 				}
 				this._fireChange(this.textContent);
 			}
+			else if(event.relatedTarget == null){
+				this._fireChange(this.textContent);
+			}
 		},
 		
 		_isAutoSuggestionPopover: function (element) {
@@ -1912,8 +1933,7 @@ sap.ui.define([
 			xPos += 10; //For clear view of cursor pos during typing (temporary fix)
 			var that = this;
 			setTimeout(function(){
-
-				if (that._oAutoSuggestionPopUp && !that._oAutoSuggestionPopUp.isOpen()) {
+				if (that._oAutoSuggestionPopUp && !that._oAutoSuggestionPopUp.isOpen() && that._focusedOut == false) {
 					that._oAutoSuggestionPopUp.destroyContent();
 					that._oAutoSuggestionPopUp.addContent(new sap.rules.ui.AutoCompleteSuggestionContent({
 						content: suggestionContent.autoComplete,
@@ -1941,7 +1961,7 @@ sap.ui.define([
 					that._oAutoSuggestionPopUp.setOffsetX(xPos);
 					that._oAutoSuggestionPopUp.setOffsetY(yPos);
 				}
-				if (!that._oAutoSuggestionPopUp.isOpen()) {
+				if (!that._oAutoSuggestionPopUp.isOpen() && that._focusedOut == false) {
 					that._oAutoSuggestionPopUp.setOffsetX(xPos);
 					that._oAutoSuggestionPopUp.setOffsetY(yPos);
 					that._oAutoSuggestionPopUp.openBy(that.getDomRef("input"));
@@ -2988,7 +3008,8 @@ sap.ui.define([
 				}
 			}
 				
- 	    }
+ 	    },
+ 	   renderer: AstExpressionBasicRenderer
 	});
 
 	return AstExpressionBasic;

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

@@ -1,59 +1,75 @@
-/*!
+/*!
  * 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";
-
-	/**
-	 * AstExpression renderer.
-	 * @namespace
-	 */
-	var AstExpressionBasicRenderer = {};
-
-	/**
-	 * 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
-	 */
-	AstExpressionBasicRenderer.render = function (oRm, oControl) {
-
-		//oRm.addClass("sapUiSizeCozy");
-		if (oControl.getParent() instanceof jQuery){
-			jQuery.sap.syncStyleClass("sapUiSizeCozy", oControl.getParent(), this.oControl);
-		}
-		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
-		var placeHolderText = oBundle.getText("ctrlSpaceCue");
-		if(placeHolderText.length>50 && oControl.getParent().getId() ===  "popover") {
-			placeHolderText = placeHolderText.substring(0,50) + " ...";
-		}
-
-		var sEditable = "contenteditable=\"true\"";
-		var sPlaceHolder = "data-placeholder=\"" + placeHolderText + "\"";
-		var aAriaPlaceholder = "aria-placeholder=\"" + placeHolderText + "\"";
-		oRm.write("<div");
-		oRm.writeControlData(oControl);
-		oRm.addClass("sapAstExpressionInputWrapper");
-		oRm.write(" aria-labelledby=\"\" >");
-		oRm.write("<pre class=\"sapAstExpressionPreSpaceMargin\">");
-		oRm.write("<div role=\"textbox\" aria-labelledby=\"\" spellcheck=\"false\"" + sEditable + sPlaceHolder + aAriaPlaceholder +
-				" id=\"" +
-			oControl.getId() + "-input\" class=\"sapAstExpressionInput\"></div>");
-		oRm.write("</pre>");
-		oRm.write("</div>");
-
-	};
-
-	return AstExpressionBasicRenderer;
-
+	
+ */
+
+sap.ui.define([
+	"sap/ui/thirdparty/jquery",
+	"sap/ui/core/syncStyleClass"
+], function (jQuery, syncStyleClass) {
+	"use strict";
+
+	/**
+	 * AstExpression renderer.
+	 * @namespace
+	 */
+	var AstExpressionBasicRenderer = {
+			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
+	 */
+	AstExpressionBasicRenderer.render = function (oRm, oControl) {
+
+		//oRm.addClass("sapUiSizeCozy");
+		if (oControl.getParent() instanceof jQuery){
+			syncStyleClass("sapUiSizeCozy", oControl.getParent(), this.oControl);
+		}
+		var oBundle = sap.ui.getCore().getLibraryResourceBundle("sap.rules.ui.i18n");
+		var placeHolderText = oBundle.getText("ctrlSpaceCue");
+		if(placeHolderText.length>50 && oControl.getParent().getId() ===  "popover") {
+			placeHolderText = placeHolderText.substring(0,50) + " ...";
+		}
+
+		var sEditable = "contenteditable=\"true\"";
+		var sPlaceHolder = "data-placeholder=\"" + placeHolderText + "\"";
+		var aAriaPlaceholder = "aria-placeholder=\"" + placeHolderText + "\"";
+		oRm.openStart("div", oControl);
+		oRm.class("sapAstExpressionInputWrapper");
+		oRm.openEnd();
+		oRm.openStart("pre");
+		oRm.class("sapAstExpressionPreSpaceMargin");
+		oRm.openEnd();
+		
+		oRm.openStart("div");
+		oRm.accessibilityState(oControl, {
+			role: "textbox",
+			labelledBy:"",
+			placeholder:placeHolderText
+			
+		});
+		oRm.attr("id", oControl.getId() + "-input");
+		oRm.attr("data-placeholder", placeHolderText);
+		oRm.attr("contenteditable", "true");
+		oRm.attr("spellcheck", "false");
+		oRm.class("sapAstExpressionInput");
+		oRm.openEnd();
+		oRm.close("div");
+		oRm.close("pre");
+		oRm.close("div");
+
+	};
+
+	return AstExpressionBasicRenderer;
+
 }, /* bExport= */ true);

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

@@ -18,14 +18,15 @@ sap.ui.define([
 	"sap/rules/ui/ast/autoCompleteContent/AutoSuggestionTimeAndDurationFunctionPanel",
 	"sap/rules/ui/ast/autoCompleteContent/AutoSuggestionSelectFunctionPanel",
 	"sap/rules/ui/ast/autoCompleteContent/AutoSuggestionOperationsPanel",
-	"sap/rules/ui/ast/autoCompleteContent/AutoSuggestionLoopFunctionPanel"
+	"sap/rules/ui/ast/autoCompleteContent/AutoSuggestionLoopFunctionPanel",
+	"./AutoCompleteSuggestionContentRenderer"
 
 ], function (jQuery, library, Control, List, JSONModel, AutoSuggestionVocabularyPanel, AutoSuggestionFixedValuePanel,
 	AutoSuggestionMathematicalOperatorPanel,
 	AutoSuggestionComparisionOperatorPanel, AutoSuggestionLogicalOperatorPanel, AutoSuggestionAggregateFunctionPanel,
 	AutoSuggestionArrayOperatorPanel, AutoSuggestionRangeOperatorPanel, AutoSuggestionMiscellaneousOperatorPanel,
 	AutoSuggestionFunctionalOperatorPanel, AutoSuggestionAdvancedFunctionPanel, AutoSuggestionTimeAndDurationFunctionPanel,
-	AutoSuggestionSelectFunctionPanel, AutoSuggestionOperationsPanel, AutoSuggestionLoopFunctionPanel) {
+	AutoSuggestionSelectFunctionPanel, AutoSuggestionOperationsPanel, AutoSuggestionLoopFunctionPanel, AutoCompleteSuggestionContentRenderer) {
 	"use strict";
 
 	var AutoCompleteSuggestionContent = Control.extend("sap.rules.ui.AutoCompleteSuggestionContent", {
@@ -334,7 +335,8 @@ sap.ui.define([
 				}
 			}
 			return false;
-		}
+		},
+		renderer: AutoCompleteSuggestionContentRenderer
 
 	});
 

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

@@ -1,44 +1,43 @@
-/*!
+/*!
  * 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";
-
-        /**
-         * DecisionTableSettings renderer.
-         *  @namespace
-         */
-        var AutoCompleteSuggestionContentRenderer = {};
-
-        /**
-         * 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
-         */
-        AutoCompleteSuggestionContentRenderer.render = function (oRm, oControl) {
-
-            oRm.write("<div");
-            oRm.writeControlData(oControl);
-            oRm.addClass("sapAstAutoCompleteSuggestionContentRenderer");
-            oRm.writeClasses();
-            oRm.write(">");
-            var AutoCompleteSuggestionContentRenderer = oControl.getAggregation("mainLayout");
-            oRm.renderControl(AutoCompleteSuggestionContentRenderer);
-            oRm.write("</div>");
-
-        };
-
-        return AutoCompleteSuggestionContentRenderer;
-
+	
+ */
+
+sap.ui.define([],
+
+    function () {
+        "use strict";
+
+        /**
+         * DecisionTableSettings renderer.
+         *  @namespace
+         */
+        var AutoCompleteSuggestionContentRenderer = {
+        		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
+         */
+        AutoCompleteSuggestionContentRenderer.render = function (oRm, oControl) {
+
+        	oRm.openStart("div", oControl);
+    		oRm.class("sapAstAutoCompleteSuggestionContentRenderer");
+    		oRm.openEnd();
+    		var AutoCompleteSuggestionContentRenderer = oControl.getAggregation("mainLayout");
+            oRm.renderControl(AutoCompleteSuggestionContentRenderer);
+    		oRm.close("div");
+        };
+
+        return AutoCompleteSuggestionContentRenderer;
+
     }, /* bExport= */ true);

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

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends  ManagedObject
 	 *
 	 * @author SAP SE
-	 * @version 1.106.0
+	 * @version 1.108.0
 	 *
 	 * @constructor
 	 * @private