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

Fixing unnecessary whitespace changes

Browse Source 
- My editor added additional whitespace to several unchanged lines, so I just reverted them
This commit is contained in:
James Lissiak
2015-06-01 10:38:10 -07:00
parent 48f24c0cf3
commit 8e4ea8437f
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/js/controller/dialogs/ImportImageController.js
View File

@@ -1,6 +1,6 @@
(function () { (function () {
var ns = $.namespace('pskl.controller.dialogs'); var ns = $.namespace('pskl.controller.dialogs');
var PREVIEW_HEIGHT = 60; var PREVIEW_HEIGHT = 60;
ns.ImportImageController = function (piskelController) { ns.ImportImageController = function (piskelController) {
this.importedImage_ = null; this.importedImage_ = null;
@@ -20,7 +20,7 @@
this.resizeWidth = $('[name=resize-width]'); this.resizeWidth = $('[name=resize-width]');
this.resizeHeight = $('[name=resize-height]'); this.resizeHeight = $('[name=resize-height]');
this.smoothResize = $('[name=smooth-resize-checkbox]'); this.smoothResize = $('[name=smooth-resize-checkbox]');
this.frameCountX = $('[name=frame-count-x]'); this.frameCountX = $('[name=frame-count-x]');
this.frameCountY = $('[name=frame-count-y]'); this.frameCountY = $('[name=frame-count-y]');
@@ -86,7 +86,7 @@
// FIXME : We remove the onload callback here because JsGif will insert // FIXME : We remove the onload callback here because JsGif will insert
// the image again and we want to avoid retriggering the image onload // the image again and we want to avoid retriggering the image onload
this.importedImage_.onload = function () { }; this.importedImage_.onload = function () {};
var fileName = this.extractFileNameFromPath_(this.file_.name); var fileName = this.extractFileNameFromPath_(this.file_.name);
this.fileNameContainer.html(fileName); this.fileNameContainer.html(fileName);
@@ -126,18 +126,18 @@
if (image) { if (image) {
if (window.confirm('You are about to create a new Piskel, unsaved changes will be lost.')) { if (window.confirm('You are about to create a new Piskel, unsaved changes will be lost.')) {
var gifLoader = new window.SuperGif({ var gifLoader = new window.SuperGif({
gif: image gif : image
}); });
gifLoader.load({ gifLoader.load({
success: function () { success : function () {
var images = gifLoader.getFrames().map(function (frame) { var images = gifLoader.getFrames().map(function (frame) {
return pskl.utils.CanvasUtils.createFromImageData(frame.data); return pskl.utils.CanvasUtils.createFromImageData(frame.data);
}); });
this.createPiskelFromImages_(images); this.createPiskelFromImages_(images);
this.closeDialog(); this.closeDialog();
}.bind(this), }.bind(this),
error: function () { error : function () {
var images = pskl.utils.CanvasUtils.createFramesFromImage( var images = pskl.utils.CanvasUtils.createFramesFromImage(
image, image,
this.frameCountX.val(), this.frameCountX.val(),

10
src/templates/dialogs/import-image.html
View File

@@ -14,17 +14,17 @@
</div> </div>
<div class="import-section"> <div class="import-section">
<span class="dialog-section-title">Size :</span> <span class="dialog-section-title">Size :</span>
<input type="text" class="textfield import-size-field" name="resize-width" />x <input type="text" class="textfield import-size-field" name="resize-width"/>x
<input type="text" class="textfield import-size-field" name="resize-height" /> <input type="text" class="textfield import-size-field" name="resize-height"/>
</div> </div>
<div class="import-section"> <div class="import-section">
<span class="dialog-section-title">Frames :</span> <span class="dialog-section-title">Frames :</span>
<input type="text" class="textfield import-size-field" name="frame-count-x" />x <input type="text" class="textfield import-size-field" name="frame-count-x"/>x
<input type="text" class="textfield import-size-field" name="frame-count-y" /> <input type="text" class="textfield import-size-field" name="frame-count-y"/>
</div> </div>
<div class="import-section"> <div class="import-section">
<span class="import-section-title">Smooth resize :</span> <span class="import-section-title">Smooth resize :</span>
<input type="checkbox" checked="checked" name="smooth-resize-checkbox" value="1" /> <input type="checkbox" checked="checked" name="smooth-resize-checkbox" value="1"/>
</div> </div>
<input type="submit" name="import-submit" class="button button-primary import-button" value="Import" /> <input type="submit" name="import-submit" class="button button-primary import-button" value="Import" />
</form> </form>