Merge pull request #87 from grosbouddha/fix-pen-tools

UI cleanup

js/Palette.js

@@ -24,7 +24,7 @@ pskl.Palette = (function() {
     */
    var createPalette_ = function (colors) {
     // Always adding transparent color
-    paletteRoot.html('<span class="palette-color transparent-color" data-color="TRANSPARENT" title="Transparent"></span>');
+    paletteRoot.html('<span class="palette-color transparent-color" data-color="TRANSPARENT" rel="tooltip" data-placement="bottom" title="Transparent"></span>');
     for(var color in colors) {
       if(color != Constants.TRANSPARENT_COLOR) {
         addColorToPalette_(color);
@@ -39,6 +39,8 @@ pskl.Palette = (function() {
       if (paletteColors.indexOf(color) == -1 && color != Constants.TRANSPARENT_COLOR) {
         var colorEl = document.createElement("li");    
         colorEl.className = "palette-color";
+        colorEl.setAttribute("rel", "tooltip");
+        colorEl.setAttribute("data-placement", "bottom");
         colorEl.setAttribute("data-color", color);
         colorEl.setAttribute("title", color);
         colorEl.style.background = color;

js/controller/AnimatedPreviewController.js

@@ -20,7 +20,8 @@
 	};
 
     ns.AnimatedPreviewController.prototype.onFPSSliderChange = function(evt) {
-		this.fps = parseInt($("#preview-fps")[0].value, 10);
+    	this.fps = parseInt($("#preview-fps")[0].value, 10);
+		$("#display-fps").html(this.fps + " FPS")
 	};
 
    	ns.AnimatedPreviewController.prototype.render = function (delta) {

js/controller/PreviewFilmController.js

@@ -35,7 +35,10 @@
     };
 
     ns.PreviewFilmController.prototype.createPreviews_ = function () {
-		this.container.html("");
+    	
+    	this.container.html("");
+		// Manually remove tooltips since mouseout events were shortcut by the DOM refresh:
+		$(".tooltip").remove();
 
 		var frameCount = this.framesheet.getFrameCount();
 
@@ -174,9 +177,11 @@
 		previewTileRoot.addEventListener('click', this.onPreviewClick_.bind(this, tileNumber));
 
 		var canvasPreviewDuplicateAction = document.createElement("button");
-		canvasPreviewDuplicateAction.className = "tile-action"
-		canvasPreviewDuplicateAction.innerHTML = "dup"
-
+		canvasPreviewDuplicateAction.setAttribute('rel', 'tooltip');
+		canvasPreviewDuplicateAction.setAttribute('data-placement', 'right');
+		canvasPreviewDuplicateAction.setAttribute('title', 'Duplicate this frame');
+		canvasPreviewDuplicateAction.className = "tile-action duplicate-frame-action"
+		
 		canvasPreviewDuplicateAction.addEventListener('click', this.onAddButtonClick_.bind(this, tileNumber));
 
 		// TODO(vincz): Eventually optimize this part by not recreating a FrameRenderer. Note that the real optim
@@ -190,8 +195,10 @@
 
 		if(tileNumber > 0 || this.framesheet.getFrameCount() > 1) {
 			var canvasPreviewDeleteAction = document.createElement("button");
-			canvasPreviewDeleteAction.className = "tile-action"
-			canvasPreviewDeleteAction.innerHTML = "del"
+			canvasPreviewDeleteAction.setAttribute('rel', 'tooltip');
+			canvasPreviewDeleteAction.setAttribute('data-placement', 'right');
+			canvasPreviewDeleteAction.setAttribute('title', 'Delete this frame');
+			canvasPreviewDeleteAction.className = "tile-action delete-frame-action"
 			canvasPreviewDeleteAction.addEventListener('click', this.onDeleteButtonClick_.bind(this, tileNumber));
 			previewTileRoot.appendChild(canvasPreviewDeleteAction);
 		}

js/controller/ToolController.js

@@ -72,7 +72,7 @@
         // TODO(vincz): Tools rendering order is not enforced by the data stucture (this.toolInstances), fix that.
         for (var toolKey in this.toolInstances) {
             currentTool = this.toolInstances[toolKey];
-            toolMarkup += '<li class="tool-icon ' + currentTool.toolId + '" data-tool-id="' + currentTool.toolId +
+            toolMarkup += '<li rel="tooltip" data-placement="bottom" class="tool-icon ' + currentTool.toolId + '" data-tool-id="' + currentTool.toolId +
                             '" title="' + currentTool.helpText + '"></li>';
         }
         $('#tools-container').html(toolMarkup);

js/drawingtools/SimplePen.js

@@ -22,10 +22,10 @@
 	 */
 	ns.SimplePen.prototype.applyToolAt = function(col, row, color, frame, overlay) {
 		if (frame.containsPixel(col, row)) {
-			this.previousCol = col;
-			this.previousRow = row;
-		    frame.setPixel(col, row, color);
+			frame.setPixel(col, row, color);
 		}
+		this.previousCol = col;
+		this.previousRow = row;
 	};
 
 	ns.SimplePen.prototype.moveToolAt = function(col, row, color, frame, overlay) {

js/lib/bootstrap/bootstrap.js

@@ -0,0 +1,275 @@
+/* ===========================================================
+ * bootstrap-tooltip.js v2.1.1
+ * http://twitter.github.com/bootstrap/javascript.html#tooltips
+ * Inspired by the original jQuery.tipsy by Jason Frame
+ * ===========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* TOOLTIP PUBLIC CLASS DEFINITION
+  * =============================== */
+
+  var Tooltip = function (element, options) {
+    this.init('tooltip', element, options)
+  }
+
+  Tooltip.prototype = {
+
+    constructor: Tooltip
+
+  , init: function (type, element, options) {
+      var eventIn
+        , eventOut
+
+      this.type = type
+      this.$element = $(element)
+      this.options = this.getOptions(options)
+      this.enabled = true
+
+      if (this.options.trigger == 'click') {
+        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+      } else if (this.options.trigger != 'manual') {
+        eventIn = this.options.trigger == 'hover' ? 'mouseenter' : 'focus'
+        eventOut = this.options.trigger == 'hover' ? 'mouseleave' : 'blur'
+        this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
+      }
+
+      this.options.selector ?
+        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+        this.fixTitle()
+    }
+
+  , getOptions: function (options) {
+      options = $.extend({}, $.fn[this.type].defaults, options, this.$element.data())
+
+      if (options.delay && typeof options.delay == 'number') {
+        options.delay = {
+          show: options.delay
+        , hide: options.delay
+        }
+      }
+
+      return options
+    }
+
+  , enter: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (!self.options.delay || !self.options.delay.show) return self.show()
+
+      clearTimeout(this.timeout)
+      self.hoverState = 'in'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'in') self.show()
+      }, self.options.delay.show)
+    }
+
+  , leave: function (e) {
+      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+
+      if (this.timeout) clearTimeout(this.timeout)
+      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+      self.hoverState = 'out'
+      this.timeout = setTimeout(function() {
+        if (self.hoverState == 'out') self.hide()
+      }, self.options.delay.hide)
+    }
+
+  , show: function () {
+      var $tip
+        , inside
+        , pos
+        , actualWidth
+        , actualHeight
+        , placement
+        , tp
+
+      if (this.hasContent() && this.enabled) {
+        $tip = this.tip()
+        this.setContent()
+
+        if (this.options.animation) {
+          $tip.addClass('fade')
+        }
+
+        placement = typeof this.options.placement == 'function' ?
+          this.options.placement.call(this, $tip[0], this.$element[0]) :
+          this.options.placement
+
+        inside = /in/.test(placement)
+
+        $tip
+          .remove()
+          .css({ top: 0, left: 0, display: 'block' })
+          .appendTo(inside ? this.$element : document.body)
+
+        pos = this.getPosition(inside)
+
+        actualWidth = $tip[0].offsetWidth
+        actualHeight = $tip[0].offsetHeight
+
+        switch (inside ? placement.split(' ')[1] : placement) {
+          case 'bottom':
+            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'top':
+            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
+            break
+          case 'left':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
+            break
+          case 'right':
+            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
+            break
+        }
+
+        $tip
+          .css(tp)
+          .addClass(placement)
+          .addClass('in')
+      }
+    }
+
+  , setContent: function () {
+      var $tip = this.tip()
+        , title = this.getTitle()
+
+      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+      $tip.removeClass('fade in top bottom left right')
+    }
+
+  , hide: function () {
+      var that = this
+        , $tip = this.tip()
+
+      $tip.removeClass('in')
+
+      function removeWithAnimation() {
+        var timeout = setTimeout(function () {
+          $tip.off($.support.transition.end).remove()
+        }, 500)
+
+        $tip.one($.support.transition.end, function () {
+          clearTimeout(timeout)
+          $tip.remove()
+        })
+      }
+
+      $.support.transition && this.$tip.hasClass('fade') ?
+        removeWithAnimation() :
+        $tip.remove()
+
+      return this
+    }
+
+  , fixTitle: function () {
+      var $e = this.$element
+      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+        $e.attr('data-original-title', $e.attr('title') || '').removeAttr('title')
+      }
+    }
+
+  , hasContent: function () {
+      return this.getTitle()
+    }
+
+  , getPosition: function (inside) {
+      return $.extend({}, (inside ? {top: 0, left: 0} : this.$element.offset()), {
+        width: this.$element[0].offsetWidth
+      , height: this.$element[0].offsetHeight
+      })
+    }
+
+  , getTitle: function () {
+      var title
+        , $e = this.$element
+        , o = this.options
+
+      title = $e.attr('data-original-title')
+        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+      return title
+    }
+
+  , tip: function () {
+      return this.$tip = this.$tip || $(this.options.template)
+    }
+
+  , validate: function () {
+      if (!this.$element[0].parentNode) {
+        this.hide()
+        this.$element = null
+        this.options = null
+      }
+    }
+
+  , enable: function () {
+      this.enabled = true
+    }
+
+  , disable: function () {
+      this.enabled = false
+    }
+
+  , toggleEnabled: function () {
+      this.enabled = !this.enabled
+    }
+
+  , toggle: function () {
+      this[this.tip().hasClass('in') ? 'hide' : 'show']()
+    }
+
+  , destroy: function () {
+      this.hide().$element.off('.' + this.type).removeData(this.type)
+    }
+
+  }
+
+
+ /* TOOLTIP PLUGIN DEFINITION
+  * ========================= */
+
+  $.fn.tooltip = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('tooltip')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.tooltip.Constructor = Tooltip
+
+  $.fn.tooltip.defaults = {
+    animation: true
+  , placement: 'top'
+  , selector: false
+  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+  , trigger: 'hover'
+  , title: ''
+  , delay: 0
+  , html: true
+  }
+
+}(window.jQuery);

js/lib/bootstrap/readme.txt

@@ -0,0 +1 @@
+Bootstrap custom build containing only the tooltip component

js/piskel.js

@@ -88,6 +88,11 @@ $.namespace("pskl");
       drawingLoop.addCallback(this.render, this);
       drawingLoop.start();
 
+      // Init (event-delegated) bootstrap tooltips:
+      $('body').tooltip({
+        selector: '[rel=tooltip]'
+      });
+
       this.connectResizeToDpiUpdate_();
     },
 
@@ -115,7 +120,10 @@ $.namespace("pskl");
      * @private
      */
     calculateDPIsForDrawingCanvas_ : function() {
-      var availableViewportHeight = $('.main-panel').height() - 50,
+
+      var userMessageGap = 80; // Reserve some height to show the user message at the bottom
+
+      var availableViewportHeight = $('.main-panel').height() - userMessageGap,
           availableViewportWidth = $('.main-panel').width(),
           previewHeight = $(".preview-container").height(),
           previewWidth = $(".preview-container").width();