diff -r 423bdf56d103 -r 98cae534083d client/js/renderer/nodeeditor.js --- a/client/js/renderer/nodeeditor.js Tue Jun 02 00:39:47 2015 +0200 +++ b/client/js/renderer/nodeeditor.js Wed Jun 03 13:16:46 2015 +0200 @@ -31,6 +31,7 @@ image: _model.get("image") || "", image_placeholder: _image_placeholder, color: (_model.has("style") && _model.get("style").color) || _created_by.get("color"), + thickness: (_model.has("style") && _model.get("style").thickness) || 1, dash: _model.has("style") && _model.get("style").dash ? "checked" : "", clip_path: _model.get("clip_path") || false, created_by_color: _created_by.get("color"), @@ -50,8 +51,7 @@ _this.editor_$.find("input, textarea, select").off("change keyup paste"); _this.editor_$.find(".Rk-Edit-Image-File").off('change'); _this.editor_$.find(".Rk-Edit-ColorPicker-Wrapper").off('hover'); - _this.editor_$.find(".Rk-Edit-Size-Down").off('click'); - _this.editor_$.find(".Rk-Edit-Size-Up").off('click'); + _this.editor_$.find(".Rk-Edit-Size-Btn").off('click'); _this.editor_$.find(".Rk-Edit-Image-Del").off('click'); _this.editor_$.find(".Rk-Edit-ColorPicker").find("li").off('hover click'); _this.editor_$.find(".Rk-CloseX").off('click'); @@ -172,7 +172,7 @@ var shiftSize = function(n) { if (_this.renderer.isEditable()) { var _newsize = n+(_model.get("size") || 0); - _this.editor_$.find(".Rk-Edit-Size-Value").text((_newsize > 0 ? "+" : "") + _newsize); + _this.editor_$.find("#Rk-Edit-Size-Value").text((_newsize > 0 ? "+" : "") + _newsize); _model.set("size", _newsize); paper.view.draw(); } else { @@ -180,15 +180,45 @@ } }; - this.editor_$.find(".Rk-Edit-Size-Down").click(function() { + this.editor_$.find("#Rk-Edit-Size-Down").click(function() { shiftSize(-1); return false; }); - this.editor_$.find(".Rk-Edit-Size-Up").click(function() { + this.editor_$.find("#Rk-Edit-Size-Up").click(function() { shiftSize(1); return false; }); + var shiftThickness = function(n) { + if (_this.renderer.isEditable()) { + var _oldThickness = ((_model.has('style') && _model.get('style').thickness) || 1), + _newThickness = n + _oldThickness; + if(_newThickness < 1 ) { + _newThickness = 1; + } + else if (_newThickness > _this.options.node_stroke_witdh_scale) { + _newThickness = _this.options.node_stroke_witdh_scale; + } + if (_newThickness !== _oldThickness) { + _this.editor_$.find("#Rk-Edit-Thickness-Value").text(_newThickness); + _model.set("style", _.assign( ((_model.has("style") && _.clone(_model.get("style"))) || {}), {thickness: _newThickness})); + paper.view.draw(); + } + } + else { + closeEditor(); + } + }; + + this.editor_$.find("#Rk-Edit-Thickness-Down").click(function() { + shiftThickness(-1); + return false; + }); + this.editor_$.find("#Rk-Edit-Thickness-Up").click(function() { + shiftThickness(1); + return false; + }); + this.editor_$.find(".Rk-Edit-Image-Del").click(function() { _this.editor_$.find(".Rk-Edit-Image").val(''); onFieldChange();