Dev environment : closure compiler + jshint update

Fixed error raised by closure compiler
Added es3 option to jshint (detect trailing commas)
Added curly option to jshint (missing curly braces for if/for blocks)
Removed trailing whitespaces (not enforced through jshint though)
This commit is contained in:
Julian Descottes
2013-09-28 23:52:51 +02:00
parent b254c582b9
commit ca427e0853
26 changed files with 136 additions and 129 deletions

View File

@ -12,8 +12,8 @@
pixels.push({"col": x, "row": y});
}
}
return pixels;
return pixels;
},
getBoundRectanglePixels : function (x0, y0, x1, y1) {
@ -30,32 +30,32 @@
pixels.push({"col": rectangle.x0, "row": y});
pixels.push({"col": rectangle.x1, "row": y});
}
return pixels;
return pixels;
},
/**
* Return an object of ordered rectangle coordinate.
* In returned object {x0, y0} => top left corner - {x1, y1} => bottom right corner
* In returned object {x0, y0} => top left corner - {x1, y1} => bottom right corner
* @private
*/
getOrderedRectangleCoordinates : function (x0, y0, x1, y1) {
return {
x0 : Math.min(x0, x1),
x0 : Math.min(x0, x1),
y0 : Math.min(y0, y1),
x1 : Math.max(x0, x1),
x1 : Math.max(x0, x1),
y1 : Math.max(y0, y1)
};
},
/**
* Return the list of pixels that would have been filled by a paintbucket tool applied
* Return the list of pixels that would have been filled by a paintbucket tool applied
* on pixel at coordinate (x,y).
* This function is not altering the Frame object argument.
* This function is not altering the Frame object argument.
*
* @param frame pskl.model.Frame The frame target in which we want to paintbucket
* @param col number Column coordinate in the frame
* @param row number Row coordinate in the frame
* @param col number Column coordinate in the frame
* @param row number Row coordinate in the frame
*
* @return an array of the pixel coordinates paint with the replacement color
*/
@ -73,10 +73,10 @@
/**
* Apply the paintbucket tool in a frame at the (col, row) initial position
* with the replacement color.
*
*
* @param frame pskl.model.Frame The frame target in which we want to paintbucket
* @param col number Column coordinate in the frame
* @param row number Row coordinate in the frame
* @param col number Column coordinate in the frame
* @param row number Row coordinate in the frame
* @param replacementColor string Hexadecimal color used to fill the area
*
* @return an array of the pixel coordinates paint with the replacement color
@ -109,11 +109,11 @@
} catch(e) {
// Frame out of bound exception.
}
if(targetColor == replacementColor) {
return;
}
queue.push({"col": col, "row": row});
var loopCount = 0;
@ -140,7 +140,7 @@
// Security loop breaker:
if(loopCount > 10 * cellCount) {
console.log("loop breaker called");
break;
break;
}
}
return paintedPixels;

View File

@ -32,7 +32,7 @@
var pData = data.piskel;
var layers = pData.layers.map(function (serializedLayer) {
return pskl.utils.Serializer.deserializeLayer(serializedLayer);
});
});
var piskel = new pskl.model.Piskel(pData.width, pData.height, pData.fps);
layers.forEach(function (layer) {
piskel.addLayer(layer);

View File

@ -23,7 +23,7 @@
var value = dict[key];
template = template.replace(new RegExp('\\{\\{'+key+'\\}\\}', 'g'), value);
}
}
}
return template;
}
};

View File

@ -8,7 +8,7 @@
KEY_TO_DEFAULT_VALUE_MAP_ : {
'SHOW_GRID' : false,
'CANVAS_BACKGROUND' : 'medium-canvas-background'
'CANVAS_BACKGROUND' : 'medium-canvas-background'
},
/**
@ -17,7 +17,7 @@
cache_ : {},
/**
* Static method to access a user defined settings value ot its default
* Static method to access a user defined settings value ot its default
* value if not defined yet.
*/
get : function (key) {
@ -34,7 +34,7 @@
this.cache_[key] = value;
this.writeToLocalStorage_(key, value);
$.publish(Events.USER_SETTINGS_CHANGED, [key, value]);
$.publish(Events.USER_SETTINGS_CHANGED, [key, value]);
},
/**

View File

@ -34,8 +34,10 @@ if (typeof Function.prototype.bind !== "function") {
var ns = $.namespace("pskl.utils");
ns.rgbToHex = function(r, g, b) {
if (r > 255 || g > 255 || b > 255)
if (r > 255 || g > 255 || b > 255) {
throw "Invalid color component";
}
return ((r << 16) | (g << 8) | b).toString(16);
};