fix: fix playground theme switch (#62)

SAP · Feb 15, 2019 · 5212a87 · 5212a87
1 parent 1b4715f
commit 5212a87
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/packages/base/src/sap/ui/webcomponents/base/shims/jquery-shim.js b/packages/base/src/sap/ui/webcomponents/base/shims/jquery-shim.js
@@ -1,5 +1,5 @@
 import { inject as injectJQuery } from "@ui5/webcomponents-core/dist/sap/ui/thirdparty/jquery";
-import fnIsPlainObject from "@ui5/webcomponents-core/dist/sap/base/util/isPlainObject";
+import isPlainObject from "@ui5/webcomponents-core/dist/sap/base/util/isPlainObject";
 
 var jQuery = {
 	extend: function() {
@@ -45,15 +45,15 @@ var jQuery = {
 					}
 
 					// Recurse if we're merging plain objects or arrays
-					if ( deep && copy && ( fnIsPlainObject( copy ) ||
+					if ( deep && copy && ( isPlainObject( copy ) ||
 							( copyIsArray = Array.isArray( copy ) ) ) ) {
 
 						if ( copyIsArray ) {
 							copyIsArray = false;
 							clone = src && Array.isArray( src ) ? src : [];
 
 						} else {
-							clone = src && fnIsPlainObject( src ) ? src : {};
+							clone = src && isPlainObject( src ) ? src : {};
 						}
 
 						// Never move original objects, clone them

diff --git a/packages/playground/webapp/www/samples/settings.js b/packages/playground/webapp/www/samples/settings.js
@@ -1,15 +1,15 @@
-(function() {
-    var HCB = "sap_belize_hcb";
-    var theme = window["sap-ui-webcomponents-main-bundle"].Core.getConfiguration().theme;
-    var documentBody = document.body;
-    if(theme === HCB) {
-        documentBody.classList.add("hcb-background");
-    } else {
-        documentBody.classList.remove("hcb-background");
-    }
-
-    window.onload =function() {
-        //Inform parent when loaded to attach handlers for scroll
-        parent.postMessage("Iframe Loaded Successfully", "*");
-    };
-})();
+(function() {
+    var HCB = "sap_belize_hcb";
+    var theme = window["sap-ui-webcomponents-main-bundle"].configuration.getTheme();
+    var documentBody = document.body;
+    if(theme === HCB) {
+        documentBody.classList.add("hcb-background");
+    } else {
+        documentBody.classList.remove("hcb-background");
+    }
+
+    window.onload =function() {
+        //Inform parent when loaded to attach handlers for scroll
+        parent.postMessage("Iframe Loaded Successfully", "*");
+    };
+})();