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

Merge branch 'master' of https://github.com/juliandescottes/piskel

Browse source
This commit is contained in:
fsvieira 2014-05-11 21:18:43 +01:00
commit 0d599ae4a7
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/js/controller/piskel/PublicPiskelController.js
View file

@ -44,7 +44,7 @@
}; };
ns.PublicPiskelController.prototype.duplicateCurrentFrame = function () { ns.PublicPiskelController.prototype.duplicateCurrentFrame = function () {
this.piskelController.duplicateFrameAt(this.getCurrentFrameIndex()); this.duplicateFrameAt(this.getCurrentFrameIndex());
}; };
ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args) { ns.PublicPiskelController.prototype.raiseSaveStateEvent_ = function (fn, args) {

1
src/templates/settings/resize.html
View file

@ -4,7 +4,6 @@
</div> </div>
<div class="settings-item"> <div class="settings-item">
<form action="" method="POST" name="resize-form"> <form action="" method="POST" name="resize-form">
<span class="resize-warning-message">Existing frames will be cropped !</span>
<div class="resize-section"> <div class="resize-section">
<span class="resize-section-title resize-section-title-small">Size :</span> <span class="resize-section-title resize-section-title-small">Size :</span>
<input type="text" class="textfield resize-size-field" name="resize-width"/>x <input type="text" class="textfield resize-size-field" name="resize-width"/>x