mirror/minify
1
0
Fork 0
mirror of https://github.com/mrclay/minify.git synced 2025-08-21 05:11:46 +02:00
Code Issues Releases Wiki Activity

Fixed JSHint errors in _index.js

Browse Source
This commit is contained in:
Steve Clay
2011-09-05 21:03:13 -03:00
parent c8e903e24b
commit 3d0f3c119a
1 changed files with 74 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

146
min/builder/_index.js
View File

@@ -2,37 +2,37 @@
* Minify URI Builder * Minify URI Builder
*/ */
var MUB = { var MUB = {
_uid : 0 _uid : 0,
,_minRoot : '/min/?' _minRoot : '/min/?',
,checkRewrite : function () { checkRewrite : function () {
var testUri = location.pathname.replace(/\/[^\/]*$/, '/rewriteTest.js').substr(1); var testUri = location.pathname.replace(/\/[^\/]*$/, '/rewriteTest.js').substr(1);
function fail() { function fail() {
$('#minRewriteFailed')[0].className = 'topNote'; $('#minRewriteFailed')[0].className = 'topNote';
}; }
$.ajax({ $.ajax({
url : '../f=' + testUri + '&' + (new Date()).getTime() url : '../f=' + testUri + '&' + (new Date()).getTime(),
,success : function (data) { success : function (data) {
if (data === '1') { if (data === '1') {
MUB._minRoot = '/min/'; MUB._minRoot = '/min/';
$('span.minRoot').html('/min/'); $('span.minRoot').html('/min/');
} else } else
fail(); fail();
} },
,error : fail error : fail
}); });
} },
/** /**
* Get markup for new source LI element * Get markup for new source LI element
*/ */
,newLi : function () { newLi : function () {
return '<li id="li' + MUB._uid + '">http://' + location.host + '/<input type=text size=20>' return '<li id="li' + MUB._uid + '">http://' + location.host + '/<input type=text size=20>' +
+ ' <button title="Remove">x</button> <button title="Include Earlier">&uarr;</button>' ' <button title="Remove">x</button> <button title="Include Earlier">&uarr;</button>' +
+ ' <button title="Include Later">&darr;</button> <span></span></li>'; ' <button title="Include Later">&darr;</button> <span></span></li>';
} },
/** /**
* Add new empty source LI and attach handlers to buttons * Add new empty source LI and attach handlers to buttons
*/ */
,addLi : function () { addLi : function () {
$('#sources').append(MUB.newLi()); $('#sources').append(MUB.newLi());
var li = $('#li' + MUB._uid)[0]; var li = $('#li' + MUB._uid)[0];
$('button[title=Remove]', li).click(function () { $('button[title=Remove]', li).click(function () {
@@ -61,22 +61,22 @@ var MUB = {
}); });
}); });
++MUB._uid; ++MUB._uid;
} },
/** /**
* In the context of a source LI element, this will analyze the URI in * In the context of a source LI element, this will analyze the URI in
* the INPUT and check the URL on the site. * the INPUT and check the URL on the site.
*/ */
,liUpdateTestLink : function () { // call in context of li element liUpdateTestLink : function () { // call in context of li element
if (! $('input', this)[0].value) if (! $('input', this)[0].value)
return; return;
var li = this; var li = this;
$('span', this).html(''); $('span', this).html('');
var url = 'http://' + location.host + '/' var url = 'http://' + location.host + '/' +
+ $('input', this)[0].value.replace(/^\//, ''); $('input', this)[0].value.replace(/^\//, '');
$.ajax({ $.ajax({
url : url url : url,
,complete : function (xhr, stat) { complete : function (xhr, stat) {
if ('success' == stat) if ('success' === stat)
$('span', li).html('&#x2713;'); $('span', li).html('&#x2713;');
else { else {
$('span', li).html('<button><b>404! </b> recheck</button>') $('span', li).html('<button><b>404! </b> recheck</button>')
@@ -84,16 +84,16 @@ var MUB = {
MUB.liUpdateTestLink.call(li); MUB.liUpdateTestLink.call(li);
}); });
} }
} },
,dataType : 'text' dataType : 'text'
}); });
} },
/** /**
* Check all source URLs * Check all source URLs
*/ */
,updateAllTestLinks : function () { updateAllTestLinks : function () {
$('#sources li').each(MUB.liUpdateTestLink); $('#sources li').each(MUB.liUpdateTestLink);
} },
/** /**
* In a given array of strings, find the character they all have at * In a given array of strings, find the character they all have at
* a particular index * a particular index
@@ -101,25 +101,25 @@ var MUB = {
* @param Number pos index to check * @param Number pos index to check
* @return mixed a common char or '' if any do not match * @return mixed a common char or '' if any do not match
*/ */
,getCommonCharAtPos : function (arr, pos) { getCommonCharAtPos : function (arr, pos) {
var i var i,
,l = arr.length l = arr.length,
,c = arr[0].charAt(pos); c = arr[0].charAt(pos);
if (c === '' || l === 1) if (c === '' || l === 1)
return c; return c;
for (i = 1; i < l; ++i) for (i = 1; i < l; ++i)
if (arr[i].charAt(pos) !== c) if (arr[i].charAt(pos) !== c)
return ''; return '';
return c; return c;
} },
/** /**
* Get the shortest URI to minify the set of source files * Get the shortest URI to minify the set of source files
* @param Array sources URIs * @param Array sources URIs
*/ */
,getBestUri : function (sources) { getBestUri : function (sources) {
var pos = 0 var pos = 0,
,base = '' base = '',
,c; c;
while (true) { while (true) {
c = MUB.getCommonCharAtPos(sources, pos); c = MUB.getCommonCharAtPos(sources, pos);
if (c === '') if (c === '')
@@ -132,29 +132,28 @@ var MUB = {
var uri = MUB._minRoot + 'f=' + sources.join(','); var uri = MUB._minRoot + 'f=' + sources.join(',');
if (base.charAt(base.length - 1) === '/') { if (base.charAt(base.length - 1) === '/') {
// we have a base dir! // we have a base dir!
var basedSources = sources var basedSources = sources,
,i i,
,l = sources.length; l = sources.length;
for (i = 0; i < l; ++i) { for (i = 0; i < l; ++i) {
basedSources[i] = sources[i].substr(base.length); basedSources[i] = sources[i].substr(base.length);
} }
base = base.substr(0, base.length - 1); base = base.substr(0, base.length - 1);
var bUri = MUB._minRoot + 'b=' + base + '&f=' + basedSources.join(','); var bUri = MUB._minRoot + 'b=' + base + '&f=' + basedSources.join(',');
//window.console && console.log([uri, bUri]); //window.console && console.log([uri, bUri]);
uri = uri.length < bUri.length uri = uri.length < bUri.length ? uri : bUri;
? uri
: bUri;
} }
return uri; return uri;
} },
/** /**
* Create the Minify URI for the sources * Create the Minify URI for the sources
*/ */
,update : function () { update : function () {
MUB.updateAllTestLinks(); MUB.updateAllTestLinks();
var sources = [] var sources = [],
,ext = false ext = false,
,fail = false; fail = false,
markup;
$('#sources input').each(function () { $('#sources input').each(function () {
var m, val; var m, val;
if (! fail && this.value && (m = this.value.match(/\.(css|js)$/))) { if (! fail && this.value && (m = this.value.match(/\.(css|js)$/))) {
@@ -166,7 +165,7 @@ var MUB = {
return alert('extensions must match!'); return alert('extensions must match!');
} }
this.value = this.value.replace(/^\//, ''); this.value = this.value.replace(/^\//, '');
if (-1 != $.inArray(this.value, sources)) { if (-1 !== $.inArray(this.value, sources)) {
fail = true; fail = true;
return alert('duplicate file!'); return alert('duplicate file!');
} }
@@ -176,30 +175,31 @@ var MUB = {
if (fail || ! sources.length) if (fail || ! sources.length)
return; return;
$('#groupConfig').val(" 'keyName' => array('//" + sources.join("', '//") + "'),"); $('#groupConfig').val(" 'keyName' => array('//" + sources.join("', '//") + "'),");
var uri = MUB.getBestUri(sources) var uri = MUB.getBestUri(sources),
,uriH = uri.replace(/</, '&lt;').replace(/>/, '&gt;').replace(/&/, '&amp;'); uriH = uri.replace(/</, '&lt;').replace(/>/, '&gt;').replace(/&/, '&amp;');
$('#uriA').html(uriH)[0].href = uri; $('#uriA').html(uriH)[0].href = uri;
$('#uriHtml').val( if (ext === 'js') {
ext === 'js' markup = '<script type="text/javascript" src="' + uriH + '"></script>';
? '<script type="text/javascript" src="' + uriH + '"></script>' } else {
: '<link type="text/css" rel="stylesheet" href="' + uriH + '" />' markup = '<link type="text/css" rel="stylesheet" href="' + uriH + '" />';
);
$('#results').show();
} }
$('#uriHtml').val(markup);
$('#results').show();
},
/** /**
* Handler for the "Add file +" button * Handler for the "Add file +" button
*/ */
,addButtonClick : function () { addButtonClick : function () {
$('#results').hide(); $('#results').hide();
MUB.addLi(); MUB.addLi();
MUB.updateAllTestLinks(); MUB.updateAllTestLinks();
$('#update').show().click(MUB.update); $('#update').show().click(MUB.update);
$('#sources li:last input')[0].focus(); $('#sources li:last input')[0].focus();
} },
/** /**
* Runs on DOMready * Runs on DOMready
*/ */
,init : function () { init : function () {
$('#jsDidntLoad').remove(); $('#jsDidntLoad').remove();
$('#app').show(); $('#app').show();
$('#sources').html(''); $('#sources').html('');
@@ -214,13 +214,13 @@ var MUB = {
if (location.hash) { if (location.hash) {
// make links out of URIs from bookmarklet // make links out of URIs from bookmarklet
$('#getBm').hide(); $('#getBm').hide();
$('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /<a href=#>' $('#bmUris').html('<p><strong>Found by bookmarklet:</strong> /<a href=#>' +
+ location.hash.substr(1).split(',').join('</a> | /<a href=#>') location.hash.substr(1).split(',').join('</a> | /<a href=#>') +
+ '</a></p>' '</a></p>'
); );
$('#bmUris a').click(function () { $('#bmUris a').click(function () {
MUB.addButtonClick(); MUB.addButtonClick();
$('#sources li:last input').val(this.innerHTML) $('#sources li:last input').val(this.innerHTML);
MUB.liUpdateTestLink.call($('#sources li:last')[0]); MUB.liUpdateTestLink.call($('#sources li:last')[0]);
$('#results').hide(); $('#results').hide();
return false; return false;
@@ -228,24 +228,26 @@ var MUB = {
} else { } else {
// setup bookmarklet 1 // setup bookmarklet 1
$.ajax({ $.ajax({
url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1) url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm.js').substr(1),
,success : function (code) { success : function (code) {
$('#bm')[0].href = code $('#bm')[0].href = code
.replace('%BUILDER_URL%', location.href) .replace('%BUILDER_URL%', location.href)
.replace(/\n/g, ' '); .replace(/\n/g, ' ');
} },
,dataType : 'text' dataType : 'text'
}); });
$.browser.msie && $('#getBm p:last').append(' Sorry, not supported in MSIE!'); if ($.browser.msie) {
$('#getBm p:last').append(' Sorry, not supported in MSIE!');
}
MUB.addButtonClick(); MUB.addButtonClick();
} }
// setup bookmarklet 2 // setup bookmarklet 2
$.ajax({ $.ajax({
url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm2.js').substr(1) url : '../?f=' + location.pathname.replace(/\/[^\/]*$/, '/bm2.js').substr(1),
,success : function (code) { success : function (code) {
$('#bm2')[0].href = code.replace(/\n/g, ' '); $('#bm2')[0].href = code.replace(/\n/g, ' ');
} },
,dataType : 'text' dataType : 'text'
}); });
MUB.checkRewrite(); MUB.checkRewrite();
} }