From a22a387f2453d3d99517dcc631e8bfcf051db230 Mon Sep 17 00:00:00 2001 From: Mark MacKay Date: Fri, 27 Jul 2012 12:13:52 -0500 Subject: [PATCH] various changes --- editor/jquery-draginput.js | 25 +- editor/svg-editor.css | 22 + editor/svg-editor.html | 49 +- editor/svg-editor.js | 59 +-- editor/svgedit.compiled.css | 4 + editor/svgedit.compiled.js | 809 ++++++++++++++++--------------- editor/temp.css | 23 +- method-draw/jquery-draginput.js | 25 +- method-draw/svg-editor.css | 22 + method-draw/svg-editor.html | 49 +- method-draw/svg-editor.js | 59 +-- method-draw/svgedit.compiled.css | 4 + method-draw/svgedit.compiled.js | 809 ++++++++++++++++--------------- method-draw/temp.css | 23 +- 14 files changed, 1032 insertions(+), 950 deletions(-) diff --git a/editor/jquery-draginput.js b/editor/jquery-draginput.js index f8f3311..0017153 100644 --- a/editor/jquery-draginput.js +++ b/editor/jquery-draginput.js @@ -38,21 +38,21 @@ $.fn.dragInput = function(cfg){ var canvas = svgEditor.canvas var selectedElems = canvas.getSelectedElems(); var isTouch = svgedit.browser.isTouch(); - var $cursor = (area && this.dragCfg.cursor) + var completed = true //for mousewheel + var $cursor = (area && this.dragCfg.cursor) ? $("
").appendTo($label) : false $input.attr("readonly", "readonly") if ($cursor && !isNaN(this.dragCfg.start)) $cursor.css("top", (this.dragCfg.start*-1)/scale+cursorHeight) //this is where all the magic happens - this.adjustValue = function(i, noUndo){ + this.adjustValue = function(i, completed){ var v; if(isNaN(this.value)) { v = this.dragCfg.reset; } else if($.isFunction(this.dragCfg.stepfunc)) { v = this.dragCfg.stepfunc(this, i); } else { - // weirdest javascript bug ever: 5.1 + 0.1 = 5.199999999 v = Number((Number(this.value) + Number(i)).toFixed(5)); } if (max !== null) v = Math.min(v, max); @@ -60,7 +60,7 @@ $.fn.dragInput = function(cfg){ if ($cursor) this.updateCursor(v); this.value = v; $label.attr("data-value", v) - if ($.isFunction(this.dragCfg.callback)) this.dragCfg.callback(this, noUndo) + if ($.isFunction(this.dragCfg.callback)) this.dragCfg.callback(this, completed) }; $label.toggleClass("draginput", $label.is("label")) @@ -84,14 +84,15 @@ $.fn.dragInput = function(cfg){ //when the mouse is released this.stop = function() { $('body').removeClass('dragging'); - $label.removeClass("active") + $label.removeClass("active"); + completed = true; $(window).unbind("mousemove.draginput touchmove.draginput mouseup.draginput touchend.draginput"); lastY = 0; if (selectedElems[0]) { var batchCmd = canvas.undoMgr.finishUndoableChange(); if (!batchCmd.isEmpty()) canvas.undoMgr.addCommandToHistory(batchCmd); } - this.adjustValue(0) + this.adjustValue(0, completed) } this.updateCursor = function(){ @@ -145,15 +146,23 @@ $.fn.dragInput = function(cfg){ }) .bind("mousewheel", function(e, delta, deltaX, deltaY){ + if (completed) canvas.undoMgr.beginUndoableChange(attr, selectedElems) + completed = false + clearTimeout(window.undoTimeout) + window.undoTimeout = setTimeout(function(){ + wheel_input.stop() + },1000) + + var wheel_input = this; if (deltaY > 0) this.adjustValue(this.dragCfg.step); else if (deltaY < 0) this.adjustValue(-this.dragCfg.step); e.preventDefault(); + }) - - }); + }); }; diff --git a/editor/svg-editor.css b/editor/svg-editor.css index 6e97962..13c2efb 100644 --- a/editor/svg-editor.css +++ b/editor/svg-editor.css @@ -2032,3 +2032,25 @@ input[readonly=readonly]:focus { transform-origin: 50% 0; } +#stroke_style_label { + font-size: 30px; + margin-top: 33px; + letter-spacing: -1px; +} + +.stroke_tool .caret { + top: 60%; +} + +#tool_align_relative { + position: absolute; + top: -5px; + left: 0; + right: 20px; + display: block; +} + +#tool_align_relative select { + width: 100%; + display: block; +} \ No newline at end of file diff --git a/editor/svg-editor.html b/editor/svg-editor.html index 1ff252f..1bae264 100644 --- a/editor/svg-editor.html +++ b/editor/svg-editor.html @@ -413,7 +413,7 @@ $(function(){ @@ -450,8 +450,15 @@ $(function(){

Multiple Elements

-
-

Align

+ +
+ +

 

@@ -462,14 +469,6 @@ $(function(){
- -
@@ -547,20 +546,20 @@ $(function(){