@openui5/sap.ui.mdc 1.99.0 → 1.100.1

package/src/sap/ui/mdc/p13n/AdaptationProvider.js

@@ -14,9 +14,9 @@ sap.ui.define([
 	 * modules such as the UIManager and the DefaultProviderRegistry.
 	 *
 	 * @author SAP SE
-	 * @private
 	 * @since 1.90
 	 * @experimental As of version 1.90
+	 * @private
 	 * @ui5-restricted sap.ui.mdc
 	 * @alias sap.ui.mdc.p13n.AdaptationProvider
 	 */

package/src/sap/ui/mdc/p13n/Engine.js

@@ -32,15 +32,16 @@ sap.ui.define([
 	var oEngine;
 
 	/**
-	 * Constructor for a new Engine. The Engine should always be accessed
-	 * via 'getInstance' and not by creating a new instance of it. The class should only be used
-	 * to create derivations.
+	 * Constructor for a new Engine.
+	 *
+	 * The Engine should always be accessed via 'getInstance' and not by creating a new instance of it.
+	 * The class should only be used to create derivations.
 	 *
 	 * @class
-	 * @extends sap.ui.base.Object
+	 * @extends sap.ui.mdc.p13n.AdaptationProvider
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -392,15 +393,14 @@ sap.ui.define([
 
 		return Promise.resolve()
 			.then(function() {
-				if (oRegistryEntry) {
-					var oModificationHandler = this.getModificationHandler(vControl);
-					return oModificationHandler.enhanceConfig(oControl, mEnhanceConfig)
-						.then(function(oConfig){
+				var oModificationHandler = this.getModificationHandler(vControl);
+				return oModificationHandler.enhanceConfig(oControl, mEnhanceConfig)
+					.then(function(oConfig){
+						if (oRegistryEntry) {
+							//to simplify debugging
 							oRegistryEntry.xConfig = oConfig;
-						});
-				} else {
-					throw new Error("The control instance needs to be registered to use xConfig!");
-				}
+						}
+					});
 			}.bind(this));
 	};
 
@@ -559,7 +559,7 @@ sap.ui.define([
 	 * @private
 	 *
 	 * @param {sap.ui.mdc.Control} vControl The registered control instance
-	 * @param {string} sKey The key for the according Controller
+	 * @param {string|string[]} aKeys The key for the according Controller
 	 * @param {Object[]} aCustomInfo A custom set of propertyinfos as base to create the UI
 	 *
 	 * @returns {Promise} A Promise resolving after the adaptation housekeeping has been initialized.
@@ -624,7 +624,7 @@ sap.ui.define([
 	 * and the set of provided registered keys.
 	 *
 	 * @param {sap.ui.mdc.Control} vControl The registered Control instance.
-	 * @param {string|array} vKey A key as string or an array of keys
+	 * @param {string|array} vKeys A key as string or an array of keys
 	 *
 	 * @returns {object} The requested UI settings of the control instance and provided keys
 	 */
@@ -761,6 +761,9 @@ sap.ui.define([
 		var sHandlerMode = aPersistenceProvider ? aPersistenceProvider[0].getMode() : "Standard";
 
 		var mHandlerMode = {
+			//During preprocessing, it might be necessary to calculate the modification handler instance
+			//without an initialized control instance --> use flex as default
+			undefined: FlexModificationHandler,
 			Global: FlexModificationHandler,
 			Transient: FlexModificationHandler,
 			Standard: FlexModificationHandler,
@@ -931,7 +934,7 @@ sap.ui.define([
 	/**
 	 * Reads the current state of the subcontrollers and triggers a state appliance
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered Control instance.
+	 * @param {sap.ui.mdc.Control} oControl The registered Control instance.
 	 * @param {array} aKeys An array of keys
 	 * @returns {Promise} A Promise resolving after all p13n changes have been calculated and processed
 	 */
@@ -1026,9 +1029,9 @@ sap.ui.define([
 	};
 
 	/**
-	 * @private
-	 *
 	 * This method can be used for debugging to retrieve the complete registry.
+	 *
+	 * @private
 	 */
 	Engine.prototype._getRegistry = function() {
 		var oRegistry = {

package/src/sap/ui/mdc/p13n/FlexUtil.js

@@ -100,11 +100,6 @@ sap.ui.define([
 				}
 
 				var aFilterConditionChanges = FlexUtil._diffConditionPath(sFieldPath, mNewConditionState[sFieldPath], mPreviousConditionState[sFieldPath], oAdaptationControl);
-
-				if (oAdaptationControl && oAdaptationControl.createPropertyInfoChanges && (aFilterConditionChanges.length > 0)) {
-					aFilterConditionChanges = oAdaptationControl.createPropertyInfoChanges(sFieldPath).concat(aFilterConditionChanges);
-				}
-
 				aConditionChanges = aConditionChanges.concat(aFilterConditionChanges);
 			}
 

package/src/sap/ui/mdc/p13n/PropertyHelper.js

@@ -16,7 +16,7 @@ sap.ui.define([
 	 *
 	 * @param {object[]} aProperties
 	 *     The properties to process in this helper
-	 * @param {object<string, object>} [mExtensions]
+	 * @param {Object<string, object>} [mExtensions]
 	 *     Key-value map, where the key is the name of the property and the value is the extension containing mode-specific information.
 	 *     The extension of a property is stored in a reserved <code>extension</code> attribute and its attributes must be specified with
 	 *     <code>mExtensionAttributeMetadata</code>.
@@ -29,7 +29,7 @@ sap.ui.define([
 	 * @extends sap.ui.mdc.util.PropertyHelper
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @private
 	 * @experimental

package/src/sap/ui/mdc/p13n/StateUtil.js

@@ -43,6 +43,10 @@ sap.ui.define([
 		*	<li><code>aggregated</code> - Set to <code>false</code>  to remove an aggregation.</li>
 		*	</ul>
 		*
+		*	<b>Note:</b>To improve the performance, you should avoid additional calls of the control’s delegate.
+		*	To do this, the <code>propertyInfo</code> property of the relevant control can be enriched with the properties used in the provided state.
+		*
+		*
 		* @private
 		* @ui5-restricted sap.fe
 		* @MDC_PUBLIC_CANDIDATE

package/src/sap/ui/mdc/p13n/UIManager.js

@@ -10,8 +10,9 @@ sap.ui.define([
 	"sap/m/p13n/Container",
 	"sap/m/p13n/AbstractContainerItem",
 	"sap/base/util/UriParameters",
-	"sap/base/Log"
-], function (BaseObject, P13nBuilder, P13nContainer, AbstractContainerItem, SAPUriParameters, Log) {
+	"sap/base/Log",
+	"sap/ui/thirdparty/jquery"
+], function (BaseObject, P13nBuilder, P13nContainer, AbstractContainerItem, SAPUriParameters, Log, jQuery) {
 	"use strict";
 
 	var ERROR_INSTANCING = "UIManager: This class is a singleton and should not be used without an AdaptationProvider. Please use 'sap.ui.mdc.p13n.Engine.getInstance().uimanager' instead";
@@ -20,7 +21,7 @@ sap.ui.define([
 	var oUIManager;
 
 	//Used for experimental features (such as livemode)
-	var oURLParams = new SAPUriParameters(window.location.search);
+	var oURLParams = SAPUriParameters.fromQuery(window.location.search);
 
 	/**
 	 * Constructor for a new UIManager.
@@ -32,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc
@@ -73,7 +74,7 @@ sap.ui.define([
 		this.bLiveMode = false;
 
 		//!!!Warning: experimental and only for testing purposes!!!----------
-		if (oURLParams.getAll("sap-ui-xx-p13nLiveMode")[0] === "true"){
+		if (oURLParams.get("sap-ui-xx-p13nLiveMode") === "true"){
 			this.bLiveMode = true;
 			Log.warning("Please note that the p13n liveMode is experimental");
 		}
@@ -101,7 +102,7 @@ sap.ui.define([
 	 * @ui5-restricted sap.ui.mdc
 	 *
 	 * @param {sap.ui.mdc.Control} vControl The registered control instance
-	 * @param {string} sKey The key for the according Controller
+	 * @param {string|string[]} vKey The key for the according Controller
 	 * @param {Object[]} aCustomInfo A custom set of propertyinfos as base to create the UI
 	 *
 	 * @returns {Promise} A Promise resolving in the P13n UI.
@@ -157,8 +158,8 @@ sap.ui.define([
 	 *
 	 * @private
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered control instance.
-	 * @param {string} aKeys The registerd key to get the corresponding Controller.
+	 * @param {sap.ui.mdc.Control} oControl The registered control instance.
+	 * @param {string} aKeys The registered key to get the corresponding Controller.
 	 *
 	 * @returns {Promise} A Promise resolving in the according container
 	 * (Depending on the Controllers livemode config).
@@ -233,9 +234,10 @@ sap.ui.define([
 	 *
 	 * @private
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered control instance.
-	 * @param {string} sKey The registerd key to get the corresponding Controller.
-	 * @param {sap.ui.core.Control} oPanel The control instance which is set in the content area of the container.
+	 * @param {sap.ui.mdc.Control} oControl The registered control instance.
+	 * @param {string[]} aKeys The registered keys to get the corresponding Controller.
+	 * @param {*} oPopupContent
+	 * @param {*} oUISettings
 	 *
 	 * @returns {Promise} Returns a Promise resolving in the container instance
 	 */
@@ -297,9 +299,10 @@ sap.ui.define([
 	 *
 	 * @private
 	 *
-	 * @param {sap.ui.mdc.Control} vControl The registered control instance.
-	 * @param {string} sKey The registerd key to get the corresponding Controller.
+	 * @param {sap.ui.mdc.Control} oControl The registered control instance.
+	 * @param {string[]} aKeys The registerd key to get the corresponding Controller.
 	 * @param {sap.ui.core.Control} oPanel The control instance which is set in the content area of the container.
+	 * @param {object} mUISettings
 	 *
 	 * @returns {sap.m.ResponsivePopover} The popover instance.
 	 */

package/src/sap/ui/mdc/p13n/modification/ModificationHandler.js

@@ -123,7 +123,10 @@ sap.ui.define([
 			.then(function(oRetrievedXConfig) {
 				oXConfig = oRetrievedXConfig;
 				if (oXConfig) {
-					return oModifier.getProperty(oXConfig, "value");
+					return oModifier.getProperty(oXConfig, "value")
+					.then(function(sConfig){
+						return merge({}, JSON.parse(sConfig.replace(/\\/g, '')));
+					});
 				}
 				return {
 					aggregations: {}
@@ -160,19 +163,20 @@ sap.ui.define([
 
 				var oAppComponent = mPropertyBag ? mPropertyBag.appComponent : undefined;
 
-				if (!oControl._pXConfigCreation) {
-					oControl._pXConfigCreation = oModifier.createAndAddCustomData(oControl, "xConfig", oConfig, oAppComponent);
-					return oControl._pXConfigCreation
+				var pDelete = Promise.resolve();
+				if (oXConfig && oControl.isA) {
+					pDelete = oModifier.removeAggregation(oControl, "customData", oXConfig)
 					.then(function(){
-						return oConfig;
-					});
-				} else {
-					oControl._pXConfigCreation
-					.then(function(oCustomData){
-						oModifier.setProperty(oCustomData, "value", oConfig);
-						return oConfig;
+						return oModifier.destroy(oXConfig);
 					});
 				}
+
+				return pDelete.then(function(){
+					return oModifier.createAndAddCustomData(oControl, "xConfig", JSON.stringify(oConfig), oAppComponent)
+					.then(function(){
+						return merge({}, oConfig);
+					});
+				});
 			});
 	};
 
@@ -203,8 +207,8 @@ sap.ui.define([
 				.then(function(oAggregationConfig) {
 					if (oAggregationConfig) {
 						return oModifier.getProperty(oAggregationConfig, "value")
-							.then(function(oValue) {
-								return merge({}, oValue);
+							.then(function(sValue) {
+								return merge({}, JSON.parse(sValue.replace(/\\/g, '')));
 							});
 					}
 					return null;
@@ -246,7 +250,7 @@ sap.ui.define([
 		oAggregationConfig = fnGetAggregationSync(oControl, "customData").find(function(oCustomData){
 			return fnGetPropertySync(oCustomData, "key") == "xConfig";
 		});
-		oConfig = oAggregationConfig ? merge({}, fnGetPropertySync(oAggregationConfig, "value")) : null;
+		oConfig = oAggregationConfig ? merge({}, JSON.parse(fnGetPropertySync(oAggregationConfig, "value").replace(/\\/g, ''))) : null;
 		return oConfig;
 	};
 

package/src/sap/ui/mdc/p13n/modules/DefaultProviderRegistry.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 *
 	 * @author SAP SE
-	 * @version 1.99.0
+	 * @version 1.100.1
 	 *
 	 * @private
 	 * @ui5-restricted sap.ui.mdc

package/src/sap/ui/mdc/p13n/panels/ActionToolbarPanel.js

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    "./ListView",
+    "sap/m/p13n/SelectionPanel",
     "sap/ui/model/Sorter"
-], function(ListView, Sorter) {
+], function(SelectionPanel, Sorter) {
 	"use strict";
 
     /**
@@ -15,7 +15,7 @@ sap.ui.define([
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class
-	 * @extends sap.ui.mdc.p13n.panels.ListView
+	 * @extends sap.m.p13n.SelectionPanel
 	 * @author SAP SE
 	 * @constructor The ActionToolbarPanel is a list based view to personalize selection and ordering of a Control aggregation.
 	 * @private
@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.p13n.panels.ActionToolbarPanel
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var ActionToolbarPanel = ListView.extend("sap.ui.mdc.p13n.panels.ActionToolbarPanel", {
+	var ActionToolbarPanel = SelectionPanel.extend("sap.ui.mdc.p13n.panels.ActionToolbarPanel", {
 		metadata: {
             library: "sap.ui.mdc"
         },
@@ -34,7 +34,7 @@ sap.ui.define([
     });
 
     ActionToolbarPanel.prototype._bindListItems = function(mBindingInfo) {
-        var oTemplate = this.getTemplate();
+        var oTemplate = this.getAggregation("_template");
 		if (oTemplate) {
             var fnGetAlignment = function(oContext) {
                 return oContext.getProperty("alignment");
@@ -49,7 +49,7 @@ sap.ui.define([
                 sorter: oSorter,
 				key: "name",
 				templateShareable: false,
-				template: this.getTemplate().clone()
+				template: this.getAggregation("_template").clone()
 			}, mBindingInfo));
 		}
     };

package/src/sap/ui/mdc/p13n/panels/AdaptFiltersPanel.js

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 sap.ui.define([
-    "sap/ui/mdc/ui/Container",
-    "sap/ui/mdc/ui/ContainerItem",
-    "./ListView",
+    "sap/m/p13n/AbstractContainer",
+    "sap/m/p13n/AbstractContainerItem",
+    "sap/m/p13n/SelectionPanel",
     "./GroupView",
     "sap/ui/model/Filter",
     "sap/m/Button",
@@ -18,9 +18,9 @@ sap.ui.define([
     "sap/m/SearchField",
     "sap/m/OverflowToolbarLayoutData",
     "sap/ui/core/Item",
-    "sap/base/util/UriParameters",
-    "sap/m/library"
-], function(Container, ContainerItem, ListView, GroupView, Filter, Button, Bar, ToolbarSpacer, Select, SegmentedButton, SegmentedButtonItem, SearchField, OverflowToolbarLayoutData, Item, SAPUriParameters, mLibrary) {
+    "sap/m/library",
+    "sap/ui/model/json/JSONModel"
+], function(AbstractContainer, AbstractContainerItem, SelectionPanel, GroupView, Filter, Button, Bar, ToolbarSpacer, Select, SegmentedButton, SegmentedButtonItem, SearchField, OverflowToolbarLayoutData, Item, mLibrary, JSONModel) {
     "use strict";
 
     // shortcut for sap.m.BarDesign
@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @param {string} [sId] ID for the new control, generated automatically if no ID is given
 	 * @param {object} [mSettings] initial settings for the new control
 	 * @class The AdaptFiltersPanel is meant to provide a container for different filter personalization views.
-	 * @extends sap.ui.mdc.ui.Container
+	 * @extends sap.m.p13n.AbstractContainer
 	 * @author SAP SE
 	 * @private
 	 * @experimental
@@ -40,7 +40,7 @@ sap.ui.define([
 	 * @alias sap.ui.mdc.p13n.panels.AdaptFiltersPanel
 	 * @ui5-metamodel This control/element also will be described in the UI5 (legacy) designtime metamodel
 	 */
-	var AdaptFiltersPanel = Container.extend("sap.ui.mdc.p13n.panels.AdaptFiltersPanel", {
+	var AdaptFiltersPanel = AbstractContainer.extend("sap.ui.mdc.p13n.panels.AdaptFiltersPanel", {
 		metadata: {
             library: "sap.ui.mdc",
             properties: {
@@ -70,17 +70,26 @@ sap.ui.define([
 
     AdaptFiltersPanel.prototype.applySettings = function(mSettings) {
 
-        this.addView(new ContainerItem({
+        this.addView(new AbstractContainerItem({
             key: this.LIST_KEY,
-            content: new ListView(this.getId() + "-listView")
+            content: new SelectionPanel(this.getId() + "-listView", {
+                activeColumn: this._getResourceText("p13nDialog.LIST_VIEW_ACTIVE"),
+                change: function(oEvt) {
+                    this.getP13nModel().setProperty("/items", oEvt.getSource().getP13nData());
+                }.bind(this)
+            })
         }));
 
-        this.addView(new ContainerItem({
+        this.addView(new AbstractContainerItem({
             key: this.GROUP_KEY,
-            content: new GroupView(this.getId() + "-groupView", {})
+            content: new GroupView(this.getId() + "-groupView", {
+                change: function(oEvt) {
+                    this.getP13nModel().setProperty("/itemsGrouped", oEvt.getSource().getP13nData());
+                }.bind(this)
+            })
         }));
 
-        Container.prototype.applySettings.apply(this, arguments);
+        AbstractContainer.prototype.applySettings.apply(this, arguments);
 
         this.getView(this.LIST_KEY).getContent().setEnableReorder(this.getEnableReorder());
 
@@ -142,7 +151,7 @@ sap.ui.define([
 
         var sSwitchId = sKey;
 
-        Container.prototype.switchView.call(this, sSwitchId);
+        AbstractContainer.prototype.switchView.call(this, sSwitchId);
 
         //Only allow show/hide non custom view
         this._getShowHideBtn().setVisible(!this._isCustomView());
@@ -151,7 +160,7 @@ sap.ui.define([
 
         //Factory logic should only be executed for non custom panels
         if (!this._isCustomView(sKey)){
-            this.showFactory(this.getCurrentViewContent().getShowFactory());
+            this.showFactory(this.getCurrentViewContent()._getShowFactory());
         }
 
         //execute filtering
@@ -217,7 +226,7 @@ sap.ui.define([
             }.bind(this));
         }
 
-		this.addView(new ContainerItem({
+		this.addView(new AbstractContainerItem({
             key: sKey,
             content: oContent.addStyleClass("sapUiMDCPanelPadding")
         }));
@@ -261,13 +270,21 @@ sap.ui.define([
      */
     AdaptFiltersPanel.prototype.setP13nModel = function(oModel) {
         this.setModel(oModel, this.P13N_MODEL);
-		this.getViews().forEach(function(oContainerItem){
-            var oP13nPanel = oContainerItem.getContent();
-			oP13nPanel.setP13nModel(oModel);
-		});
+        this.getView(this.LIST_KEY).getContent().setP13nData(oModel.getProperty("/items"));
+        this.getView(this.GROUP_KEY).getContent().setP13nData(oModel.getProperty("/itemsGrouped"));
         this._filterByModeAndSearch();
     };
 
+    AdaptFiltersPanel.prototype.setP13nData = function(oP13nData) {
+        var oP13nModel = this.getP13nModel();
+        if (!oP13nModel) {
+            this.setP13nModel(new JSONModel(oP13nData));
+        } else {
+            this.getView(this.LIST_KEY).getContent().setP13nData(oP13nModel.getProperty("/items"));
+            this.getView(this.GROUP_KEY).getContent().setP13nData(oP13nModel.getProperty("/itemsGrouped"));
+        }
+    };
+
     /**
      * Restores the default ui state of the <code>AdaptFiltersPanel</code>.
      */
@@ -295,7 +312,7 @@ sap.ui.define([
         if (!this._oShowHideBtn) {
             this._oShowHideBtn = new Button({
                 press: function(oEvt) {
-                    this.showFactory(!this.getCurrentViewContent().getShowFactory());
+                    this.showFactory(!this.getCurrentViewContent()._getShowFactory());
                     var oBtn = oEvt.oSource;
                     var sNewText = oBtn.getText() === sShowText ? sHideText : sShowText;
                     oBtn.setText(sNewText);
@@ -303,7 +320,7 @@ sap.ui.define([
             });
         }
 
-        this._oShowHideBtn.setText(!this._isCustomView() && this.getCurrentViewContent().getShowFactory() ? sHideText : sShowText);
+        this._oShowHideBtn.setText(!this._isCustomView() && this.getCurrentViewContent()._getShowFactory() ? sHideText : sShowText);
         return this._oShowHideBtn;
     };
 
@@ -381,7 +398,7 @@ sap.ui.define([
                 ],
                 selectionChange: function(oEvt) {
                     if (this.getCurrentViewKey() === this.LIST_KEY) {
-                        this.getCurrentViewContent().removeMoveButtons();
+                        this.getCurrentViewContent()._removeMoveButtons();
                     }
                     var sKey = oEvt.getParameter("item").getKey();
                     this.switchView(sKey);
@@ -410,11 +427,16 @@ sap.ui.define([
         //Update value - necessary due to view switch
         this._getSearchField().setValue(this._sSearchString);
 
-        this.getCurrentViewContent().filterWithoutDestroy(aFilters);
+        this.getCurrentViewContent().filterContent(aFilters);
 
         return aFilters;
     };
 
+
+    AdaptFiltersPanel.prototype._getResourceText = function(sKey) {
+        return sap.ui.getCore().getLibraryResourceBundle("sap.ui.mdc").getText(sKey);
+    };
+
     //TODO: Renable with refactoring
     /*
     function matchTermToSearchRegex(term){
@@ -446,14 +468,14 @@ sap.ui.define([
                 vFilterMode = new Filter("visible", "EQ", true);
                 break;
             case "active":
-                vFilterMode = new Filter("isFiltered", "EQ", true);
+                vFilterMode = new Filter("active", "EQ", true);
                 break;
             case "mandatory":
                 vFilterMode = new Filter("required", "EQ", true);
                 break;
             case "visibleactive":
                 vFilterMode = new Filter([
-                    new Filter("isFiltered", "EQ", true),
+                    new Filter("active", "EQ", true),
                     new Filter("visible", "EQ", true)
                 ], true);
                 break;
@@ -467,7 +489,7 @@ sap.ui.define([
     };
 
     AdaptFiltersPanel.prototype.exit = function() {
-        Container.prototype.exit.apply(this, arguments);
+        AbstractContainer.prototype.exit.apply(this, arguments);
         this._sModeKey = null;
         this._sSearchString = null;
     };

package/src/sap/ui/mdc/p13n/panels/ChartItemPanel.js

@@ -24,8 +24,9 @@ sap.ui.define([
 	"sap/m/library",
 	"sap/ui/Device",
 	"sap/ui/core/ResizeHandler",
-	"sap/ui/core/CustomData"
-], function (BasePanel, Label, ColumnListItem, Select, Text, Item, MDCLib, Button, Column, Table, Filter, FilterOperator, VBox, HBox, ComboBox, Sorter, Log, mLibrary, Device, ResizeHandler, CustomData) {
+	"sap/ui/core/CustomData",
+	"sap/ui/thirdparty/jquery"
+], function (BasePanel, Label, ColumnListItem, Select, Text, Item, MDCLib, Button, Column, Table, Filter, FilterOperator, VBox, HBox, ComboBox, Sorter, Log, mLibrary, Device, ResizeHandler, CustomData, jQuery) {
 	"use strict";
 
     // shortcut for sap.m.FlexJustifyContent
@@ -40,7 +41,7 @@ sap.ui.define([
 	 * @class TODO
 	 *        <h3><b>Note:</b></h3>
 	 *        The control is experimental and the API/behaviour is not finalised and hence this should not be used for productive usage.
-	 * @extends sap.ui.mdc.p13n.panels.BasePanel
+	 * @extends sap.m.p13n.BasePanel
 	 * @author SAP SE
 	 * @constructor The API/behaviour is not finalised and hence this control should not be used for productive usage.
 	 * @private