Comparing version 1.0.6 to 1.0.7
@@ -285,8 +285,8 @@ (function() { | ||
x18n.globalEval = function(src) { | ||
return (window.execScript || function(src) { | ||
return eval.call(window, src); | ||
return ((typeof window !== "undefined" && window !== null ? window.execScript : void 0) || function(src) { | ||
return eval.call(typeof window !== "undefined" && window !== null, src); | ||
})(src); | ||
}; | ||
oldT = window.t; | ||
oldT = typeof window !== "undefined" && window !== null ? window.t : void 0; | ||
@@ -328,7 +328,11 @@ x18n.t = function() { | ||
x18n.t.noConflict = function() { | ||
window.t = oldT; | ||
if (typeof window !== "undefined" && window !== null) { | ||
window.t = oldT; | ||
} | ||
return x18n.t; | ||
}; | ||
window.t = x18n.t; | ||
if (typeof window !== "undefined" && window !== null) { | ||
window.t = x18n.t; | ||
} | ||
@@ -344,3 +348,3 @@ x18n.on('dict:change', function() { | ||
if (typeof module !== "undefined" && module !== null) { | ||
if ((typeof module !== "undefined" && module !== null) && (module.exports != null)) { | ||
Observable = require('observable_js'); | ||
@@ -347,0 +351,0 @@ module.exports = base(Observable); |
{ | ||
"name": "x18n", | ||
"version": "1.0.6", | ||
"version": "1.0.7", | ||
"description": "A JavaScript internationalisation library", | ||
@@ -5,0 +5,0 @@ "github": "https://github.com/florian/x18n", |
673812
16049