diff --git a/client.js b/client.js index 0b66ed2b..78441a3d 100644 --- a/client.js +++ b/client.js @@ -1166,7 +1166,7 @@ CloudClient._ajaxLoad = function(path, pNeedRefresh) /* ######################## */ try{ - $.ajax({ + Util.ajax({ url: path, error: Util.Images.showError, diff --git a/lib/client/editor.js b/lib/client/editor.js index bfff9196..c3a1eaa0 100644 --- a/lib/client/editor.js +++ b/lib/client/editor.js @@ -3,6 +3,8 @@ var CloudCommander, CloudFunc, CodeMirror; * and later will be Ace */ (function(){ + "use strict"; + var Util = CloudCommander.Util; CloudCommander.Editor = { @@ -87,7 +89,7 @@ var CloudCommander, CloudFunc, CodeMirror; var lThis = this; var initCodeMirror_f = function(pValue){ - CodeMirror(lCloudEditor,{ + new CodeMirror(lCloudEditor,{ mode : 'javascript', value : pValue, theme : 'night', @@ -138,7 +140,7 @@ var CloudCommander, CloudFunc, CodeMirror; 400); /* reading data from current file */ - $.ajax({ + Util.ajax({ url:lA, error: (function(jqXHR, textStatus, errorThrown){ lThis.loading = false; diff --git a/lib/client/google_analytics.js b/lib/client/google_analytics.js index ea7024f0..12c8b1cd 100644 --- a/lib/client/google_analytics.js +++ b/lib/client/google_analytics.js @@ -1,14 +1,21 @@ var CloudCommander, _gaq; (function(){ + "use strict"; + /* setting google analitics tracking code */ _gaq = [['_setAccount', 'UA-33536569-2'], ['_trackPageview']]; + var lOnError_f = window.onerror; window.onerror = function(msg, url, line) { var preventErrorAlert = true; _gaq.push(['_trackEvent', 'JS Error', msg, navigator.userAgent + ' -> ' + url + " : " + line]); + + if(typeof lOnError_f === 'function') + lOnError_f(); + return preventErrorAlert; }; diff --git a/lib/client/ie.js b/lib/client/ie.js index 25d4b80f..24b1b7b6 100644 --- a/lib/client/ie.js +++ b/lib/client/ie.js @@ -1,7 +1,9 @@ /* script, fixes ie */ -var CloudCommander; +var CloudCommander, $; (function(){ + "use strict"; + document.head = document.getElementsByTagName("head")[0]; document.getElementsByClassName = function(pClassName){ @@ -13,7 +15,7 @@ var CloudCommander; /* setting function context (this) */ lUtil.bind = function(pFunction, pContext){ - return jQuery.proxy(pFunction, pContext); + return $.proxy(pFunction, pContext); }; lUtil.getByClass = function(pClass, pElement){ diff --git a/lib/client/viewer.js b/lib/client/viewer.js index 5214f3c4..6e28f9c0 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -22,7 +22,6 @@ var CloudCommander, CloudFunc, $; * different objects) */ CloudCommander.Viewer.FancyBox.getConfig = (function(){ - var lThis = this; return{ /* function do her work * before FauncyBox shows @@ -105,7 +104,7 @@ var CloudCommander, CloudFunc, $; if (lLink.indexOf(CloudFunc.NOJS) === CloudFunc.FS.length) lLink = lLink.replace(CloudFunc.NOJS, ''); - $.ajax({ + Util.ajax({ url : lLink, error : (function(jqXHR, textStatus, errorThrown){ lThis.loading = false; diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 1c7b893f..b568742a 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -154,19 +154,19 @@ CloudFunc.getShortedSize = function(pSize){ /* Константы размеров, что используются * внутри функции */ - var l1BMAX=1024; - var l1KBMAX=1048576; - var l1MBMAX=1073741824; - var l1GBMAX=1099511627776; - var l1TBMAX=1125899906842624; + var l1BMAX = 1024; + var l1KBMAX = 1048576; + var l1MBMAX = 1073741824; + var l1GBMAX = 1099511627776; + var l1TBMAX = 1125899906842624; var lShorted; - if(pSize