diff --git a/js/popup.js b/js/popup.js index b3a18f345..02e8c6fb1 100644 --- a/js/popup.js +++ b/js/popup.js @@ -42,25 +42,7 @@ var formatNumber = function(count) { if ( typeof count !== 'number' ) { return ''; } - var s = count.toFixed(0); - if ( count >= 1000 ) { - if ( count < 10000 ) { - s = s.slice(0,1) + '.' + s.slice(1,3) + 'K'; - } else if ( count < 100000 ) { - s = s.slice(0,2) + '.' + s.slice(2,3) + 'K'; - } else if ( count < 1000000 ) { - s = s.slice(0,3) + 'K'; - } else if ( count < 10000000 ) { - s = s.slice(0,1) + '.' + s.slice(1,3) + 'M'; - } else if ( count < 100000000 ) { - s = s.slice(0,2) + '.' + s.slice(2,3) + 'M'; - } else if ( count < 1000000000 ) { - s = s.slice(0,3) + 'M'; - } else { - s = s.slice(0,-9) + 'G'; - } - } - return s; + return count.toLocaleString(); }; /******************************************************************************/ diff --git a/make-opera-package.sh b/make-opera-package.sh new file mode 100755 index 000000000..599cee63b --- /dev/null +++ b/make-opera-package.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# +# This script assumes a linux environment + +echo "*** uBlock: Creating Opera web store package" +./make-package.sh +rm -r dist/ublock/_locales/ru +rm -r dist/ublock/_locales/zh_CN +echo "*** uBlock: Opera package done." diff --git a/make-package.sh b/make-package.sh new file mode 100755 index 000000000..95f648c70 --- /dev/null +++ b/make-package.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# +# This script assumes a linux environment + +echo "*** uBlock: Creating web store package" +echo "*** uBlock: Copying files" +cp -R assets dist/ublock/ +rm dist/ublock/assets/*.sh +cp -R css dist/ublock/ +cp -R img dist/ublock/ +cp -R js dist/ublock/ +cp -R lib dist/ublock/ +cp -R _locales dist/ublock/ +cp *.html dist/ublock/ +cp *.txt dist/ublock/ +cp manifest.json dist/ublock/ +echo "*** uBlock: Package done." + diff --git a/manifest.json b/manifest.json index 004accc2d..962aeb0f9 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "__MSG_extName__", "short_name": "µBlock", - "version": "0.1.4.0", + "version": "0.1.4.2", "description": "__MSG_extShortDesc__", "icons": { "16": "img/icon_16.png", diff --git a/stats.html b/stats.html index b47379bdf..827b67194 100644 --- a/stats.html +++ b/stats.html @@ -24,6 +24,10 @@ select { padding: 2px 0; font-size: 14px; min-width: 20em; + max-width: 40em; + } +select option { + max-width: 40em; } #requests { margin: 2em 0 0 0; @@ -35,7 +39,6 @@ select { #requests table { margin: 1em 0; border: 0; - font: 12px mono; border-collapse: collapse; min-width: 600px; } @@ -56,6 +59,9 @@ tr.domainHeader td span { color: #aaa; cursor: pointer; } +tr.requestEntry { + font: 12px monospace; + } tr.requestEntry td:nth-of-type(1) { border: 0; background-color: white;