diff options
| -rw-r--r-- | js/LICENSE.txt | 5 | ||||
| -rw-r--r-- | js/piwik.js | 2 | ||||
| -rw-r--r-- | piwik.js | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/js/LICENSE.txt b/js/LICENSE.txt index 720761bc34..ab78cf9da6 100644 --- a/js/LICENSE.txt +++ b/js/LICENSE.txt @@ -1,4 +1,5 @@ -Copyright 2010 Anthon Pang +Copyright (c) Piwik and contributors + All rights reserved. Redistribution and use in source and binary forms, with or without @@ -27,3 +28,5 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +View online: http://piwik.org/free-software/bsd/
\ No newline at end of file diff --git a/js/piwik.js b/js/piwik.js index 3c7b989f87..18c6d7706e 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -5,7 +5,7 @@ * * @link http://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD + * @license http://piwik.org/free-software/bsd/ Simplified BSD (also in js/LICENSE.txt) */ // Refer to README for build instructions when minifying this file for distribution. @@ -5,7 +5,7 @@ * * @link http://piwik.org * @source https://github.com/piwik/piwik/blob/master/js/piwik.js - * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD + * @license http://piwik.org/free-software/bsd/ Simplified BSD (also in js/LICENSE.txt) */ if(!this.JSON2){this.JSON2={}}(function(){function d(f){return f<10?"0"+f:f}function l(n,m){var f=Object.prototype.toString.apply(n);if(f==="[object Date]"){return isFinite(n.valueOf())?n.getUTCFullYear()+"-"+d(n.getUTCMonth()+1)+"-"+d(n.getUTCDate())+"T"+d(n.getUTCHours())+":"+d(n.getUTCMinutes())+":"+d(n.getUTCSeconds())+"Z":null}if(f==="[object String]"||f==="[object Number]"||f==="[object Boolean]"){return n.valueOf()}if(f!=="[object Array]"&&typeof n.toJSON==="function"){return n.toJSON(m)}return n}var c=new RegExp("[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]","g"),e='\\\\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]',i=new RegExp("["+e,"g"),j,b,k={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},h; function a(f){i.lastIndex=0;return i.test(f)?'"'+f.replace(i,function(m){var n=k[m];return typeof n==="string"?n:"\\u"+("0000"+m.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+f+'"'}function g(s,p){var n,m,t,f,q=j,o,r=p[s];if(r&&typeof r==="object"){r=l(r,s)}if(typeof h==="function"){r=h.call(p,s,r)}switch(typeof r){case"string":return a(r);case"number":return isFinite(r)?String(r):"null";case"boolean":case"null":return String(r);case"object":if(!r){return"null"}j+=b;o=[];if(Object.prototype.toString.apply(r)==="[object Array]"){f=r.length;for(n=0;n<f;n+=1){o[n]=g(n,r)||"null"}t=o.length===0?"[]":j?"[\n"+j+o.join(",\n"+j)+"\n"+q+"]":"["+o.join(",")+"]";j=q;return t}if(h&&typeof h==="object"){f=h.length;for(n=0;n<f;n+=1){if(typeof h[n]==="string"){m=h[n];t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}else{for(m in r){if(Object.prototype.hasOwnProperty.call(r,m)){t=g(m,r);if(t){o.push(a(m)+(j?": ":":")+t)}}}}t=o.length===0?"{}":j?"{\n"+j+o.join(",\n"+j)+"\n"+q+"}":"{"+o.join(",")+"}";j=q; |