archive-gh-me/jsbin
1
0
Fork 0
mirror of https://github.com/jsbin/jsbin.git synced 2026-01-25 15:38:56 +00:00
Code Issues Projects Releases Wiki Activity

Adding check for settings extend

Browse Source
This commit is contained in:
Fabien O'Carroll 2014-02-17 12:28:50 +00:00
parent 57486a2267
commit e5b77aba2f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/jsbin.js
View File

@ -65,7 +65,9 @@ if (storedSettings === "undefined") {
storedSettings = null;
}
window.jsbin.settings = $.extend(JSON.parse(storedSettings || '{}'), jsbin.settings);
$.extend(window.jsbin.settings.editor, jsbin.user.settings);
if (window.jsbin.settings && window.jsbin.settings.editor) {
$.extend(window.jsbin.settings.editor, jsbin.user.settings);
}
// if the above code isn't dodgy, this for hellz bells is:
jsbin.mobile = /WebKit.*Mobile.*|Android/.test(navigator.userAgent);
jsbin.tablet = /iPad/i.test(navigator.userAgent); // sue me.
@ -254,4 +256,4 @@ if (jsbin.embed) {
$window.on('focus', function () {
return false;
});
}
}