wbrawner/piskel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prototypization of PaletteController

Browse source 
I love new words
This commit is contained in:
Vince 2012-09-16 13:50:40 +02:00
parent b671d46dbf
commit 5b9bc6edb1
2 changed files with 88 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
js/controller/PaletteController.js
View file

@ -1,20 +1,15 @@
/*
* @provide pskl.Palette
*
* @require Constants
* @require Events
*/
$.namespace("pskl");
(function () {
var ns = $.namespace("pskl.controller");
pskl.Palette = (function() {
var paletteRoot,
paletteColors = [];
ns.PaletteController = function () {
this.paletteRoot = null;
this.paletteColors = [];
};
/**
* @private
*/
var onPickerChange_ = function(evt, isPrimary) {
ns.PaletteController.prototype.onPickerChange_ = function(evt, isPrimary) {
var inputPicker = $(evt.target);
$.publish(Events.COLOR_SELECTED, [inputPicker.val(), evt.data.isPrimary]);
};
@ -22,12 +17,12 @@ pskl.Palette = (function() {
/**
* @private
*/
var createPalette_ = function (colors) {
ns.PaletteController.prototype.createPalette_ = function (colors) {
// Always adding transparent color
paletteRoot.html('<span class="palette-color transparent-color" data-color="TRANSPARENT" title="Transparent"></span>');
this.paletteRoot.html('<span class="palette-color transparent-color" data-color="TRANSPARENT" title="Transparent"></span>');
for(var color in colors) {
if(color != Constants.TRANSPARENT_COLOR) {
addColorToPalette_(color);
this.addColorToPalette_(color);
}
}
};
@ -35,33 +30,36 @@ pskl.Palette = (function() {
/**
* @private
*/
var addColorToPalette_ = function (color) {
if (paletteColors.indexOf(color) == -1 && color != Constants.TRANSPARENT_COLOR) {
ns.PaletteController.prototype.addColorToPalette_ = function (color) {
if (this.paletteColors.indexOf(color) == -1 && color != Constants.TRANSPARENT_COLOR) {
var colorEl = document.createElement("li");
colorEl.className = "palette-color";
colorEl.setAttribute("data-color", color);
colorEl.setAttribute("title", color);
colorEl.style.background = color;
paletteRoot[0].appendChild(colorEl);
paletteColors.push(color);
this.paletteRoot.append(colorEl);
this.paletteColors.push(color);
}
};
/**
* @private
*/
var onPaletteColorClick_ = function (event) {
ns.PaletteController.prototype.onPaletteColorClick_ = function (event) {
var selectedColor = $(event.target).data("color");
if (event.which == 1) { // left button
updateColorPicker(selectedColor, $('#color-picker'));
this.updateColorPicker_(selectedColor, $('#color-picker'));
$.publish(Events.COLOR_SELECTED, [selectedColor, true]);
} else if (event.which == 3) { // right button
updateColorPicker(selectedColor, $('#secondary-color-picker'));
this.updateColorPicker_(selectedColor, $('#secondary-color-picker'));
$.publish(Events.COLOR_SELECTED, [selectedColor, false]);
}
};
var updateColorPicker = function (color, colorPicker) {
/**
* @private
*/
ns.PaletteController.prototype.updateColorPicker_ = function (color, colorPicker) {
if (color == Constants.TRANSPARENT_COLOR) {
// We can set the current palette color to transparent.
// You can then combine this transparent color with an advanced
@ -79,34 +77,37 @@ pskl.Palette = (function() {
}
};
return {
init: function(framesheet) {
/**
* @public
*/
ns.PaletteController.prototype.init = function(framesheet) {
paletteRoot = $("#palette");
this.paletteRoot = $("#palette");
this.framesheet = framesheet;
// Initialize palette:
createPalette_(framesheet.getUsedColors());
this.createPalette_(this.framesheet.getUsedColors());
$.subscribe(Events.FRAMESHEET_RESET, function(evt) {
createPalette_(framesheet.getUsedColors());
});
$.subscribe(Events.FRAMESHEET_RESET, $.proxy(function(evt) {
this.createPalette_(this.framesheet.getUsedColors());
}, this));
paletteRoot.mouseup(onPaletteColorClick_);
$.subscribe(Events.COLOR_SELECTED, function(evt, color) {
addColorToPalette_(color);
});
this.paletteRoot.mouseup($.proxy(this.onPaletteColorClick_, this));
// Initialize colorpicker:
$.subscribe(Events.COLOR_SELECTED, $.proxy(function(evt, color) {
this.addColorToPalette_(color);
}, this));
// Initialize colorpickers:
var colorPicker = $('#color-picker');
colorPicker.val(Constants.DEFAULT_PEN_COLOR);
colorPicker.change({isPrimary : true}, onPickerChange_);
colorPicker.change({isPrimary : true}, $.proxy(this.onPickerChange_, this));
var secondaryColorPicker = $('#secondary-color-picker');
secondaryColorPicker.val(Constants.TRANSPARENT_COLOR);
secondaryColorPicker.change({isPrimary : false}, onPickerChange_);
secondaryColorPicker.change({isPrimary : false}, $.proxy(this.onPickerChange_, this));
}
};
})();

3
js/piskel.js
View file

@ -149,7 +149,8 @@ $.namespace("pskl");
var toolController = new pskl.controller.ToolController();
toolController.init();
pskl.Palette.init(frameSheet);
var paletteController = new pskl.controller.PaletteController();
paletteController.init(frameSheet);
},
getFramesheetIdFromUrl : function() {