From 8cdd554db26633b76456f39a79eb0912ce71db01 Mon Sep 17 00:00:00 2001 From: Vince Date: Fri, 14 Jun 2013 13:17:20 +0200 Subject: [PATCH] Code cleanup + unsued images removal --- css/style.css | 28 ++++++++++++++-------------- img/actions/add.png | Bin 631 -> 0 bytes img/actions/delete.png | Bin 608 -> 0 bytes img/actions/duplicate.png | Bin 634 -> 0 bytes img/actions/image-export.png | Bin 602 -> 0 bytes index.html | 4 +--- js/controller/DrawingController.js | 21 ++++----------------- 7 files changed, 19 insertions(+), 34 deletions(-) delete mode 100755 img/actions/add.png delete mode 100755 img/actions/delete.png delete mode 100755 img/actions/duplicate.png delete mode 100644 img/actions/image-export.png diff --git a/css/style.css b/css/style.css index 78615689..7d94ec42 100644 --- a/css/style.css +++ b/css/style.css @@ -141,20 +141,20 @@ body { * User messages */ .user-message { - position: absolute; - right: 0; - bottom: 0; - background-color: #F9EDBE; - padding: 10px 47px; - border-top-left-radius: 7px; - color: #222; - border: #F0C36D 1px solid; - border-right: 0; - border-bottom: 0; - font-weight: bold; - font-size: 13px; - z-index: 10000; - max-width: 300px; + position: absolute; + right: 0; + bottom: 0; + background-color: #F9EDBE; + padding: 10px 47px; + border-top-left-radius: 7px; + color: #222; + border: #F0C36D 1px solid; + border-right: 0; + border-bottom: 0; + font-weight: bold; + font-size: 13px; + z-index: 10000; + max-width: 300px; } .user-message .close { diff --git a/img/actions/add.png b/img/actions/add.png deleted file mode 100755 index 3c03e4d3002459a4da1df8688153a4f81c089670..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP) z3@J)5GrDw$qAiNL6dgN7_b$NK{lO4?z%tg+#Z+Qrl2h+BM499k-eN zbjF=|dfu6xoRwW)c;KDqv?cpg6DCJg7|Vahw-V*ZN3Wm*q68oX^Ni^m}+mlNBWx*68S2>(? zy=pTcP=L0O#o_|ao;!u-Yp;9OW3%jYnwF>w1S7~-8-+Zae}EJh%UsK~c$=Q^bmudt z&1lx@JoXOVHn51@BA<%Brh3= z-9ivUMY_fYft@-Cf`^jsU8+OW#p-_uLvS#0hCfO48XDs*tUs|4g;oXK+cPCLJ=fhwHh!qaEWUWde3*^-R|*5?6W}OpKs3PWW~LsB_s$Mu@qVf05t(D zA#S4`1X6{_YNf!|3M9EbL=9ukB7inqT968H8~WYc3q)=uQouP^ zRu|GOXa(s({;fp(0vLbu1Q+rjQbV*AbXB?9B;?z}`|!6mq8oRZb}RS!c2~*C@OI5A z<+pL};$TC8(iM<~xSTvOGSvJdhA;QL{X$A3OA>zMQFCW z{HTZc`m=%MMuT}6l6opA6cxpQ(K4|8^Ed9aT6ns=>`{bk-7wtbQc6Q53I6_BLb-MY zmoAJ`vkZZ+(K+g(8+M?@9)4}@Lx?`wySw*vP z8b;u`aG+tz2#OrcOiiIysi53!K4Of$<1&geflB@sY}v-O$)PWgO1jq3R4s3$SEojZqk2H>tCEX>2v=G}vc(AyL;c7LE zdcBX_vcQiH4s4TitUsIi{{q~cB$qZ`Z)_MTIUSZC8M$lba`izLDGtN!q}yG}1PBhH oG{C>0EkTD6WddjZ8~+I~0Ab_KHUhVY4gdfE07*qoM6N<$f&#k@w*UYD diff --git a/index.html b/index.html index 92403dbc..18c2799e 100644 --- a/index.html +++ b/index.html @@ -64,7 +64,6 @@
-
@@ -82,7 +81,6 @@
-
@@ -101,7 +99,7 @@ - + diff --git a/js/controller/DrawingController.js b/js/controller/DrawingController.js index f0932409..bfd1acfa 100644 --- a/js/controller/DrawingController.js +++ b/js/controller/DrawingController.js @@ -77,7 +77,9 @@ ns.DrawingController.prototype.startDPIUpdateTimer_ = function () { - if (this.dpiUpdateTimer) window.clearInterval(this.dpiUpdateTimer); + if (this.dpiUpdateTimer) { + window.clearInterval(this.dpiUpdateTimer); + } this.dpiUpdateTimer = window.setTimeout($.proxy(this.updateDPI_, this), 200); }, @@ -258,25 +260,10 @@ leftSectionWidth = $('.left-column').width(), rightSectionWidth = $('.right-column').width(), availableViewportWidth = $('body').width() - leftSectionWidth - rightSectionWidth, - //previewHeight = $(".preview-container").height(), - //previewWidth = $(".preview-container").width(), framePixelHeight = this.framesheet.getCurrentFrame().getHeight(), framePixelWidth = this.framesheet.getCurrentFrame().getWidth(); var dpi = pskl.PixelUtils.calculateDPI(availableViewportHeight, availableViewportWidth, framePixelHeight, framePixelWidth); - /* - var drawingCanvasHeight = dpi * framePixelHeight; - var drawingCanvasWidth = dpi * framePixelWidth; - */ - // Check if preview and drawing canvas overlap - /* - var heightGap = drawingCanvasHeight + previewHeight - availableViewportHeight, - widthGap = drawingCanvasWidth + previewWidth - availableViewportWidth; - if (heightGap > 0 && widthGap > 0) { - // Calculate the DPI change needed to bridge height and width gap - var gapDPI = pskl.PixelUtils.calculateDPI(heightGap, widthGap, framePixelHeight, framePixelWidth); - // substract gap dpi to initial dpi - dpi -= (gapDPI + 1); - }*/ + return dpi; };