Base class fix

agnellvj · Jan 22, 2015 · da14ae0 · da14ae0
1 parent 8b79834
commit da14ae0
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/js/mobiscroll.core.js b/js/mobiscroll.core.js
@@ -199,12 +199,14 @@
             // Update original user settings
             extend(settings, ss);
 
-            if (settings.theme === 'auto') {
-                delete settings.theme;
-            }
+            if (that._hasTheme) {
+                if (settings.theme === 'auto') {
+                    delete settings.theme;
+                }
 
-            if (settings.theme === 'default') {
-                settings.theme = 'mobiscroll';
+                if (settings.theme === 'default') {
+                    settings.theme = 'mobiscroll';
+                }
             }
 
             // Load user defaults
@@ -289,6 +291,8 @@
             return that;
         };
 
+        settings = settings || {};
+
         // Autogenerate id
         if (!el.id) {
             el.id = 'mobiscroll' + (++id);