Merge pull request #246 from IDotD/Idrinth-patch-1

Update core.js
IDotD · Jan 11, 2017 · 1a99b37 · 1a99b37
2 parents 53a8865 + 4f4953b
commit 1a99b37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/mods/core.js b/src/mods/core.js
@@ -10,7 +10,7 @@ idrinth.core = {
      * @returns {Boolean}
      */
     fieldIsSetting: function ( parent, field, allowObjects ) {
-        return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function';
+        return parent && typeof parent === 'object' && field && parent.hasOwnProperty ( field ) && ( parent[field] === null || typeof parent[field] !== 'object' || allowObjects ) && typeof parent[field] !== 'function';
     },
     ajax: {
         runHome: function ( url, success, failure, timeout, additionalHeader, isStatic ) {
@@ -160,4 +160,4 @@ idrinth.core = {
             }
         }
     }
-};
+};
diff --git a/src/root.scss b/src/root.scss
@@ -135,6 +135,7 @@
 
 #idrinth-controls {
     top: 5px;
+    @include z-offset(5);
     right: 5px;
     position: fixed;
 }