mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

merged from master

Browse Source
This commit is contained in:
Julian Descottes
2012-08-30 01:30:26 +02:00
parent a1872d3521 52a9d7b379
commit bd8b72f3d5
11 changed files with 9996 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9227
js/lib/jquery-1.8.0.js vendored Normal file
View File

File diff suppressed because it is too large Load Diff

21
js/lib/pubsub.js Normal file
View File

@ -0,0 +1,21 @@
/* jQuery Tiny Pub/Sub - v0.7 - 10/27/2011
* http://benalman.com/
* Copyright (c) 2011 "Cowboy" Ben Alman; Licensed MIT, GPL */
(function($) {
var o = $({});
$.subscribe = function() {
o.on.apply(o, arguments);
};
$.unsubscribe = function() {
o.off.apply(o, arguments);
};
$.publish = function() {
o.trigger.apply(o, arguments);
};
}(jQuery));

5
js/piskel.js
View File

@ -192,7 +192,6 @@
body.setAttribute('onmouseup', 'piskel.onCanvasMouseup(event)');
drawingAreaContainer.setAttribute('onmousedown', 'piskel.onCanvasMousedown(event)');
drawingAreaContainer.setAttribute('onmousemove', 'piskel.onCanvasMousemove(event)');
this.drawFrameToCanvas(frameSheet.getFrameByIndex(this.getActiveFrameIndex()), drawingAreaCanvas, drawingCanvasDpi);
},
@ -246,6 +245,7 @@
}
$("display-fps").innerHTML = animPreviewFPS + " fps";
animFPSTuner.value = animPreviewFPS;
$("fps-value").innerHTML = animPreviewFPS + " fps";
refreshUpdater = startPreviewRefresh();
});
},
@ -482,4 +482,5 @@
window.piskel = piskel;
piskel.init();
})(function(id){return document.getElementById(id)});
})(function(id){return document.getElementById(id)});
//small change for checking my git setup :(