diff -r 1796e0220bef -r 408da84d4dc0 client/js/paper-renderer.js --- a/client/js/paper-renderer.js Fri Apr 19 13:39:39 2013 +0200 +++ b/client/js/paper-renderer.js Fri Apr 19 15:31:56 2013 +0200 @@ -16,24 +16,24 @@ _DOUBLETAP_DELAY: 800, _DOUBLETAP_DISTANCE: 20*20, _USER_PLACEHOLDER : function(_renkan) { - return { - color: _renkan.options.default_user_color, - title: _renkan.translate("(unknown user)"), - get: function(attr) { - return this[attr] || false; - } - } + return { + color: _renkan.options.default_user_color, + title: _renkan.translate("(unknown user)"), + get: function(attr) { + return this[attr] || false; + } + } }, _BOOKMARKLET_CODE: function(_renkan) { - return "(function(a,b,c,d,e,f,h,i,j,k,l,m,n,o,p,q,r){a=document;b=a.body;c=a.location.href;j='draggable';m='text/x-iri-';d=a.createElement('div');d.innerHTML='" - + _renkan.translate("Drag items from this website, drop them in Renkan").replace(/ /g,"_") - + "

'.replace(/_/g,String.fromCharCode(32));b.appendChild(d);e=[{r:/https?:\\/\\/[^\\/]*twitter\\.com\\//,s:'.tweet',n:'twitter'},{r:/https?:\\/\\/[^\\/]*google\\.[^\\/]+\\//,s:'.g',n:'google'},{r:/https?:\\/\\/[^\\/]*lemonde\\.fr\\//,s:'[data-vr-contentbox]',n:'lemonde'}];f=false;e.forEach(function(g){if(g.r.test(c)){f=g;}});if(f){h=function(){Array.prototype.forEach.call(a.querySelectorAll(f.s),function(i){i[j]=true;k=i.style;k.borderWidth='2px';k.borderColor='#909';k.borderStyle='solid';k.backgroundColor='rgba(200,0,180,.1)';})};window.setInterval(h,500);h();};a.addEventListener('dragstart',function(k){l=k.dataTransfer;l.setData(m+'source-uri',c);l.setData(m+'source-title',a.title);n=k.target;if(f){o=n;while(!o.attributes[j]){o=o.parentNode;if(o==b){break;}}}if(f&&o.attributes[j]){p=o.cloneNode(true);l.setData(m+'specific-site',f.n)}else{q=a.getSelection();if(q.type==='Range'||!q.type){p=q.getRangeAt(0).cloneContents();}else{p=n.cloneNode();}}r=a.createElement('div');r.appendChild(p);l.setData('text/x-iri-selected-text',r.textContent.trim());l.setData('text/x-iri-selected-html',r.innerHTML);},false);})();" + return "(function(a,b,c,d,e,f,h,i,j,k,l,m,n,o,p,q,r){a=document;b=a.body;c=a.location.href;j='draggable';m='text/x-iri-';d=a.createElement('div');d.innerHTML='" + + _renkan.translate("Drag items from this website, drop them in Renkan").replace(/ /g,"_") + + "

'.replace(/_/g,String.fromCharCode(32));b.appendChild(d);e=[{r:/https?:\\/\\/[^\\/]*twitter\\.com\\//,s:'.tweet',n:'twitter'},{r:/https?:\\/\\/[^\\/]*google\\.[^\\/]+\\//,s:'.g',n:'google'},{r:/https?:\\/\\/[^\\/]*lemonde\\.fr\\//,s:'[data-vr-contentbox]',n:'lemonde'}];f=false;e.forEach(function(g){if(g.r.test(c)){f=g;}});if(f){h=function(){Array.prototype.forEach.call(a.querySelectorAll(f.s),function(i){i[j]=true;k=i.style;k.borderWidth='2px';k.borderColor='#909';k.borderStyle='solid';k.backgroundColor='rgba(200,0,180,.1)';})};window.setInterval(h,500);h();};a.addEventListener('dragstart',function(k){l=k.dataTransfer;l.setData(m+'source-uri',c);l.setData(m+'source-title',a.title);n=k.target;if(f){o=n;while(!o.attributes[j]){o=o.parentNode;if(o==b){break;}}}if(f&&o.attributes[j]){p=o.cloneNode(true);l.setData(m+'specific-site',f.n)}else{q=a.getSelection();if(q.type==='Range'||!q.type){p=q.getRangeAt(0).cloneContents();}else{p=n.cloneNode();}}r=a.createElement('div');r.appendChild(p);l.setData('text/x-iri-selected-text',r.textContent.trim());l.setData('text/x-iri-selected-html',r.innerHTML);},false);})();" }, shortenText : function(_text, _maxlength) { - return (_text.length > _maxlength ? (_text.substr(0,_maxlength) + '…') : _text); - }, + return (_text.length > _maxlength ? (_text.substr(0,_maxlength) + '…') : _text); + }, drawEditBox : function(_options, _coords, _path, _xmargin, _selector) { - _selector.css({ + _selector.css({ width: ( _options.tooltip_width - 2* _options.tooltip_padding ), }) var _height = _selector.outerHeight() + 2* _options.tooltip_padding, @@ -93,8 +93,8 @@ this._removeBinding = function() { _renderer.removeRepresentation(_this); _(function() { - _renderer.redraw() - }).defer(); + _renderer.redraw() + }).defer(); } this.model.on("change", this._changeBinding ); this.model.on("remove", this._removeBinding ); @@ -175,77 +175,77 @@ this.circle.__representation = this; this.circle.fillColor = this.options.node_fill_color; if (this.options.show_node_circles) { - this.circle.strokeWidth = this.options.node_stroke_width; - this.h_ratio = 1; + this.circle.strokeWidth = this.options.node_stroke_width; + this.h_ratio = 1; } else { - this.circle.opacity = .01; - this.h_ratio = 0; + this.circle.opacity = .01; + this.h_ratio = 0; } this.title = Rkns.$('
').appendTo(this.renderer.labels_$); if (this.options.editor_mode) { - this.buttons = [ - new Rkns.Renderer.NodeEditButton(this.renderer, null), - new Rkns.Renderer.NodeRemoveButton(this.renderer, null), - new Rkns.Renderer.NodeLinkButton(this.renderer, null), - new Rkns.Renderer.NodeEnlargeButton(this.renderer, null), - new Rkns.Renderer.NodeShrinkButton(this.renderer, null) - ]; - for (var i = 0; i < this.buttons.length; i++) { - this.buttons[i].source_representation = this; - } + this.buttons = [ + new Rkns.Renderer.NodeEditButton(this.renderer, null), + new Rkns.Renderer.NodeRemoveButton(this.renderer, null), + new Rkns.Renderer.NodeLinkButton(this.renderer, null), + new Rkns.Renderer.NodeEnlargeButton(this.renderer, null), + new Rkns.Renderer.NodeShrinkButton(this.renderer, null) + ]; + for (var i = 0; i < this.buttons.length; i++) { + this.buttons[i].source_representation = this; + } } else { - this.buttons = []; + this.buttons = []; } this.last_circle_radius = 1; // this.title.paragraphStyle.justification = 'center'; if (this.renderer.minimap) { - this.renderer.minimap.node_layer.activate(); - this.minimap_circle = new paper.Path.Circle([0, 0], 1); - this.minimap_circle.__representation = this.renderer.minimap.miniframe.__representation; - this.renderer.minimap.node_group.addChild(this.minimap_circle); + this.renderer.minimap.node_layer.activate(); + this.minimap_circle = new paper.Path.Circle([0, 0], 1); + this.minimap_circle.__representation = this.renderer.minimap.miniframe.__representation; + this.renderer.minimap.node_group.addChild(this.minimap_circle); } } Rkns.Renderer.Node.prototype.redraw = function(_dontRedrawEdges) { var _model_coords = new paper.Point(this.model.get("position")), - _baseRadius = this.options.node_size_base * Math.exp((this.model.get("size") || 0) * Rkns.Renderer._NODE_SIZE_STEP); + _baseRadius = this.options.node_size_base * Math.exp((this.model.get("size") || 0) * Rkns.Renderer._NODE_SIZE_STEP); if (!this.is_dragging || !this.paper_coords) { this.paper_coords = this.renderer.toPaperCoords(_model_coords); } this.circle_radius = _baseRadius * this.renderer.scale; if (this.last_circle_radius !== this.circle_radius) { - this.buttons.forEach(function(b) { - b.setSectorSize(); - }); - var square = new paper.Size(this.circle_radius, this.circle_radius), - topleft = this.paper_coords.subtract(square), - bounds = new paper.Rectangle(topleft, square.multiply(2)); - this.circle.fitBounds(bounds); - if (this.node_image) { - this.node_image.fitBounds(bounds); - } + this.buttons.forEach(function(b) { + b.setSectorSize(); + }); + var square = new paper.Size(this.circle_radius, this.circle_radius), + topleft = this.paper_coords.subtract(square), + bounds = new paper.Rectangle(topleft, square.multiply(2)); + this.circle.fitBounds(bounds); + if (this.node_image) { + this.node_image.fitBounds(bounds); + } } else { - this.circle.position = this.paper_coords; - if (this.node_image) { + this.circle.position = this.paper_coords; + if (this.node_image) { this.node_image.position = this.paper_coords; } } this.last_circle_radius = this.circle_radius; var _text = this.model.get("title") || this.renkan.translate(this.options.label_untitled_nodes) || ""; - _text = Rkns.Renderer.shortenText(_text, this.options.node_label_max_length); - this.title.text(_text); - this.title.css({ - left: this.paper_coords.x, - top: this.paper_coords.y + this.circle_radius * this.h_ratio + this.options.node_label_distance - }) + _text = Rkns.Renderer.shortenText(_text, this.options.node_label_max_length); + this.title.text(_text); + this.title.css({ + left: this.paper_coords.x, + top: this.paper_coords.y + this.circle_radius * this.h_ratio + this.options.node_label_distance + }) var _color = this.model.get("color") || (this.model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER(this.renkan)).get("color"); this.circle.strokeColor = _color; var _pc = this.paper_coords; - this.buttons.forEach(function(b) { - b.moveTo(_pc); - }); + this.buttons.forEach(function(b) { + b.moveTo(_pc); + }); var _img = this.model.get("image"); if (_img && _img !== this.img) { var _image = new Image(), @@ -257,29 +257,29 @@ _this.renderer.node_layer.activate(); var _ratio = Math.min(2 / _image.width, 2 / _image.height ); if (!_this.options.show_node_circles) { - _this.h_ratio = Math.min(1, _image.height / _image.width); + _this.h_ratio = Math.min(1, _image.height / _image.width); } var _raster = new paper.Raster(_image); if (_this.options.clip_node_images) { - var _clip = new paper.Path.Circle([0, 0], 1); - _raster.scale(_ratio); - _this.node_image = new paper.Group(_clip, _raster); - _this.node_image.opacity = .99; - /* This is a workaround to allow clipping at group level - * If opacity was set to 1, paper.js would merge all clipping groups in one (known bug). - */ - _this.node_image.clipped = true; - _clip.__representation = _this; + var _clip = new paper.Path.Circle([0, 0], 1); + _raster.scale(_ratio); + _this.node_image = new paper.Group(_clip, _raster); + _this.node_image.opacity = .99; + /* This is a workaround to allow clipping at group level + * If opacity was set to 1, paper.js would merge all clipping groups in one (known bug). + */ + _this.node_image.clipped = true; + _clip.__representation = _this; } else { - _this.node_image = _raster; + _this.node_image = _raster; } _this.node_image.__representation = _this; - var square = new paper.Size(_this.circle_radius, _this.circle_radius), - topleft = _this.paper_coords.subtract(square), - bounds = new paper.Rectangle(topleft, square.multiply(2)); - _this.node_image.fitBounds(bounds); + var square = new paper.Size(_this.circle_radius, _this.circle_radius), + topleft = _this.paper_coords.subtract(square), + bounds = new paper.Rectangle(topleft, square.multiply(2)); + _this.node_image.fitBounds(bounds); _this.redraw(); - paper.view.draw(); + paper.view.draw(); } _image.src = _img; } @@ -290,34 +290,34 @@ } if (this.renderer.minimap) { - this.minimap_circle.fillColor = _color; - var minipos = this.renderer.toMinimapCoords(_model_coords), - miniradius = this.renderer.minimap.scale * _baseRadius, - minisize = new paper.Size([miniradius, miniradius]); - this.minimap_circle.fitBounds(minipos.subtract(minisize), minisize.multiply(2)); + this.minimap_circle.fillColor = _color; + var minipos = this.renderer.toMinimapCoords(_model_coords), + miniradius = this.renderer.minimap.scale * _baseRadius, + minisize = new paper.Size([miniradius, miniradius]); + this.minimap_circle.fitBounds(minipos.subtract(minisize), minisize.multiply(2)); } if (!_dontRedrawEdges) { - Rkns._.each(this.project.get("edges").filter(function (ed) { return ((ed.to === this.model) || (ed.from === this.model));}), function(edge, index, list){ - var repr = this.renderer.getRepresentationByModel(edge); - if(repr != null && typeof repr.from_representation.paper_coords !== "undefined" && typeof repr.to_representation.paper_coords !== "undefined") { - repr.redraw(); - } - }, this); + Rkns._.each(this.project.get("edges").filter(function (ed) { return ((ed.to === this.model) || (ed.from === this.model));}), function(edge, index, list){ + var repr = this.renderer.getRepresentationByModel(edge); + if(repr != null && typeof repr.from_representation.paper_coords !== "undefined" && typeof repr.to_representation.paper_coords !== "undefined") { + repr.redraw(); + } + }, this); } } Rkns.Renderer.Node.prototype.paperShift = function(_delta) { - if (this.options.editor_mode) { - if (!this.renkan.read_only) { - this.is_dragging = true; - this.paper_coords = this.paper_coords.add(_delta); - this.redraw(); - } - } else { - this.renderer.paperShift(_delta); - } + if (this.options.editor_mode) { + if (!this.renkan.read_only) { + this.is_dragging = true; + this.paper_coords = this.paper_coords.add(_delta); + this.redraw(); + } + } else { + this.renderer.paperShift(_delta); + } } Rkns.Renderer.Node.prototype.openEditor = function() { @@ -328,46 +328,46 @@ } Rkns.Renderer.Node.prototype.select = function() { - this.selected = true; + this.selected = true; this.circle.strokeWidth = this.options.selected_node_stroke_width; if (this.renderer.isEditable()) { - this.buttons.forEach(function(b) { - b.show(); - }); + this.buttons.forEach(function(b) { + b.show(); + }); } var _uri = this.model.get("uri"); if (_uri) { - Rkns.$('.Rk-Bin-Item').each(function() { - var _el = Rkns.$(this); - if (_el.attr("data-uri") == _uri) { - _el.addClass("selected"); - } - }); + Rkns.$('.Rk-Bin-Item').each(function() { + var _el = Rkns.$(this); + if (_el.attr("data-uri") == _uri) { + _el.addClass("selected"); + } + }); } if (!this.options.editor_mode) { this.openEditor(); } if (this.renderer.minimap) { - this.minimap_circle.strokeWidth = this.options.minimap_highlight_weight; - this.minimap_circle.strokeColor = this.options.minimap_highlight_color; + this.minimap_circle.strokeWidth = this.options.minimap_highlight_weight; + this.minimap_circle.strokeColor = this.options.minimap_highlight_color; } } Rkns.Renderer.Node.prototype.unselect = function(_newTarget) { - this.selected = false; + this.selected = false; if (!_newTarget || _newTarget.source_representation !== this) { - this.buttons.forEach(function(b) { - b.hide(); - }); - this.circle.strokeWidth = this.options.node_stroke_width; + this.buttons.forEach(function(b) { + b.hide(); + }); + this.circle.strokeWidth = this.options.node_stroke_width; Rkns.$('.Rk-Bin-Item').removeClass("selected"); - if (this.renderer.minimap) { - this.minimap_circle.strokeColor = undefined; - } + if (this.renderer.minimap) { + this.minimap_circle.strokeColor = undefined; + } } } - + Rkns.Renderer.Node.prototype.highlight = function() { this.circle.fillColor = this.options.highlighted_node_fill_color; if (this.node_image) { @@ -391,24 +391,24 @@ } }; if (this.renderer.isEditable()) { - this.model.set(_data); + this.model.set(_data); } } Rkns.Renderer.Node.prototype.mousedown = function(_event, _isTouch) { - if (_isTouch) { - this.renderer.unselectAll(); - this.select(); - } + if (_isTouch) { + this.renderer.unselectAll(); + this.select(); + } } Rkns.Renderer.Node.prototype.mouseup = function(_event, _isTouch) { if (this.renderer.isEditable() && this.renderer.is_dragging) { this.saveCoords(); } else { - if (!_isTouch) { - this.openEditor(); - } + if (!_isTouch) { + this.openEditor(); + } } this.renderer.click_target = null; this.renderer.is_dragging = false; @@ -417,13 +417,13 @@ Rkns.Renderer.Node.prototype.destroy = function(_event) { this.super("destroy"); - this.buttons.forEach(function(b) { - b.destroy(); - }); + this.buttons.forEach(function(b) { + b.destroy(); + }); this.circle.remove(); this.title.remove(); if (this.renderer.minimap) { - this.minimap_circle.remove(); + this.minimap_circle.remove(); } if (this.node_image) { this.node_image.remove(); @@ -446,10 +446,10 @@ this.line.strokeWidth = this.options.edge_stroke_width; this.arrow = new paper.Path(); this.arrow.add( - [ 0, 0 ], - [ this.options.edge_arrow_length, this.options.edge_arrow_width / 2 ], - [ 0, this.options.edge_arrow_width ] - ); + [ 0, 0 ], + [ this.options.edge_arrow_length, this.options.edge_arrow_width / 2 ], + [ 0, this.options.edge_arrow_width ] + ); this.arrow.__representation = this; this.text = Rkns.$('
').appendTo(this.renderer.labels_$); this.arrow_angle = 0; @@ -461,11 +461,11 @@ } if (this.renderer.minimap) { - this.renderer.minimap.edge_layer.activate(); - this.minimap_line = new paper.Path(); - this.minimap_line.add([0,0],[0,0]); - this.minimap_line.__representation = this.renderer.minimap.miniframe.__representation; - this.minimap_line.strokeWidth = 1; + this.renderer.minimap.edge_layer.activate(); + this.minimap_line = new paper.Path(); + this.minimap_line.add([0,0],[0,0]); + this.minimap_line.__representation = this.renderer.minimap.miniframe.__representation; + this.minimap_line.strokeWidth = 1; } } @@ -473,7 +473,7 @@ this.from_representation = this.renderer.getRepresentationByModel(this.model.get("from")); this.to_representation = this.renderer.getRepresentationByModel(this.model.get("to")); if (!this.from_representation || !this.to_representation) { - return; + return; } var _p0a = this.from_representation.paper_coords, _p1a = this.to_representation.paper_coords, @@ -509,26 +509,26 @@ _textdelta = _textdelta.multiply(-1); } var _text = this.model.get("title") || this.renkan.translate(this.options.label_untitled_edges) || ""; - _text = Rkns.Renderer.shortenText(_text, this.options.node_label_max_length); + _text = Rkns.Renderer.shortenText(_text, this.options.node_label_max_length); this.text.text(_text); var _textpos = this.paper_coords.add(_textdelta); this.text.css({ - left: _textpos.x, - top: _textpos.y, - transform: "rotate(" + _a + "deg)", - "-moz-transform": "rotate(" + _a + "deg)", - "-webkit-transform": "rotate(" + _a + "deg)" + left: _textpos.x, + top: _textpos.y, + transform: "rotate(" + _a + "deg)", + "-moz-transform": "rotate(" + _a + "deg)", + "-webkit-transform": "rotate(" + _a + "deg)" }); this.text_angle = _a; if (this.options.editor_mode) { - this.edit_button.moveTo(this.paper_coords); - this.remove_button.moveTo(this.paper_coords); + this.edit_button.moveTo(this.paper_coords); + this.remove_button.moveTo(this.paper_coords); } if (this.renderer.minimap) { - this.minimap_line.strokeColor = _color; - this.minimap_line.segments[0].point = this.renderer.toMinimapCoords(new paper.Point(this.from_representation.model.get("position"))); - this.minimap_line.segments[1].point = this.renderer.toMinimapCoords(new paper.Point(this.to_representation.model.get("position"))); + this.minimap_line.strokeColor = _color; + this.minimap_line.segments[0].point = this.renderer.toMinimapCoords(new paper.Point(this.from_representation.model.get("position"))); + this.minimap_line.segments[1].point = this.renderer.toMinimapCoords(new paper.Point(this.to_representation.model.get("position"))); } } @@ -540,33 +540,33 @@ } Rkns.Renderer.Edge.prototype.select = function() { - this.selected = true; + this.selected = true; this.line.strokeWidth = this.options.selected_edge_stroke_width; if (this.renderer.isEditable()) { - this.edit_button.show(); - this.remove_button.show(); - } + this.edit_button.show(); + this.remove_button.show(); + } if (!this.options.editor_mode) { this.openEditor(); } } Rkns.Renderer.Edge.prototype.unselect = function(_newTarget) { - this.selected = false; + this.selected = false; if (!_newTarget || _newTarget.source_representation !== this) { - if (this.options.editor_mode) { - this.edit_button.hide(); - this.remove_button.hide(); + if (this.options.editor_mode) { + this.edit_button.hide(); + this.remove_button.hide(); } this.line.strokeWidth = this.options.edge_stroke_width; } } Rkns.Renderer.Edge.prototype.mousedown = function(_event, _isTouch) { - if (_isTouch) { - this.renderer.unselectAll(); - this.select(); - } + if (_isTouch) { + this.renderer.unselectAll(); + this.select(); + } } Rkns.Renderer.Edge.prototype.mouseup = function(_event, _isTouch) { @@ -576,23 +576,23 @@ this.from_representation.is_dragging = false; this.to_representation.is_dragging = false; } else { - if (!_isTouch) { - this.openEditor(); - } - } + if (!_isTouch) { + this.openEditor(); + } + } this.renderer.click_target = null; this.renderer.is_dragging = false; } Rkns.Renderer.Edge.prototype.paperShift = function(_delta) { - if (this.options.editor_mode) { - if (!this.options.read_only) { - this.from_representation.paperShift(_delta); - this.to_representation.paperShift(_delta); - } - } else { - this.renderer.paperShift(_delta); - } + if (this.options.editor_mode) { + if (!this.options.read_only) { + this.from_representation.paperShift(_delta); + this.to_representation.paperShift(_delta); + } + } else { + this.renderer.paperShift(_delta); + } } Rkns.Renderer.Edge.prototype.destroy = function() { @@ -601,12 +601,12 @@ this.arrow.remove(); this.text.remove(); if (this.renderer.minimap) { - this.minimap_line.remove(); + this.minimap_line.remove(); } if (this.options.editor_mode) { - this.edit_button.destroy(); - this.remove_button.destroy(); - } + this.edit_button.destroy(); + this.remove_button.destroy(); + } var _this = this; this.bundle.edges = Rkns._(this.bundle.edges).reject(function(_edge) { return _edge === _this; @@ -631,10 +631,10 @@ this.arrow = new paper.Path(); this.arrow.fillColor = _color; this.arrow.add( - [ 0, 0 ], - [ this.options.edge_arrow_length, this.options.edge_arrow_width / 2 ], - [ 0, this.options.edge_arrow_width ] - ); + [ 0, 0 ], + [ this.options.edge_arrow_length, this.options.edge_arrow_width / 2 ], + [ 0, this.options.edge_arrow_width ] + ); this.arrow.__representation = this; this.arrow_angle = 0; } @@ -652,11 +652,11 @@ } Rkns.Renderer.TempEdge.prototype.paperShift = function(_delta) { - if (!this.renderer.isEditable()) { - this.renderer.removeRepresentation(_this); - paper.view.draw(); - return; - } + if (!this.renderer.isEditable()) { + this.renderer.removeRepresentation(_this); + paper.view.draw(); + return; + } this.end_pos = this.end_pos.add(_delta); var _hitResult = paper.project.hitTest(this.end_pos); this.renderer.findTarget(_hitResult); @@ -670,18 +670,18 @@ if (_hitResult && typeof _hitResult.item.__representation !== "undefined") { var _target = _hitResult.item.__representation; if (_target.type.substr(0,4) === "Node") { - var _destmodel = _target.model || _target.source_representation.model; - if (_model !== _destmodel) { - var _data = { - id: Rkns.Utils.getUID('edge'), - created_by: this.renkan.current_user, - from: _model, - to: _destmodel - }; - if (this.renderer.isEditable()) { - this.project.addEdge(_data); - } - } + var _destmodel = _target.model || _target.source_representation.model; + if (_model !== _destmodel) { + var _data = { + id: Rkns.Utils.getUID('edge'), + created_by: this.renkan.current_user, + from: _model, + to: _destmodel + }; + if (this.renderer.isEditable()) { + this.project.addEdge(_data); + } + } } if (_model === _target.model || (_target.source_representation && _target.source_representation.model === _model)) { @@ -747,7 +747,7 @@ this.editor_$ .html(_template({ node: { - has_creator: !!_model.get("created_by"), + has_creator: !!_model.get("created_by"), title: _model.get("title"), uri: _model.get("uri"), short_uri: Rkns.Renderer.shortenText((_model.get("uri") || "").replace(/^(https?:\/\/)?(www\.)?/,'').replace(/\/$/,''),40), @@ -763,63 +763,63 @@ })); this.redraw(); var _this = this, - closeEditor = function() { - _this.renderer.removeRepresentation(_this); - paper.view.draw(); - } - + closeEditor = function() { + _this.renderer.removeRepresentation(_this); + paper.view.draw(); + } + this.editor_$.find(".Rk-CloseX").click(closeEditor); if (this.renderer.isEditable()) { - - var onFieldChange = Rkns._(function() { - Rkns._(function() { - if (_this.renderer.isEditable()) { - var _uri = _this.editor_$.find(".Rk-Edit-URI").val(), - _image = _this.editor_$.find(".Rk-Edit-Image").val(); - _this.editor_$.find(".Rk-Edit-ImgPreview").attr("src", _image || _image_placeholder); - _this.editor_$.find(".Rk-Edit-Goto").attr("href",_uri); - var _data = { - title: _this.editor_$.find(".Rk-Edit-Title").val(), - description: _this.editor_$.find(".Rk-Edit-Description").val(), - uri: _uri, - image: _image - } - _model.set(_data); - _this.redraw(); - } else { - closeEditor(); - } - - }).defer(); - }).throttle(500); - - this.editor_$.on("keyup", function(_e) { - if (_e.keyCode === 27) { - closeEditor(); - } - }); - - this.editor_$.find("input, textarea").on("change keyup paste", onFieldChange); - + + var onFieldChange = Rkns._(function() { + Rkns._(function() { + if (_this.renderer.isEditable()) { + var _uri = _this.editor_$.find(".Rk-Edit-URI").val(), + _image = _this.editor_$.find(".Rk-Edit-Image").val(); + _this.editor_$.find(".Rk-Edit-ImgPreview").attr("src", _image || _image_placeholder); + _this.editor_$.find(".Rk-Edit-Goto").attr("href",_uri); + var _data = { + title: _this.editor_$.find(".Rk-Edit-Title").val(), + description: _this.editor_$.find(".Rk-Edit-Description").val(), + uri: _uri, + image: _image + } + _model.set(_data); + _this.redraw(); + } else { + closeEditor(); + } + + }).defer(); + }).throttle(500); + + this.editor_$.on("keyup", function(_e) { + if (_e.keyCode === 27) { + closeEditor(); + } + }); + + this.editor_$.find("input, textarea").on("change keyup paste", onFieldChange); + this.editor_$.find(".Rk-Edit-Image-File").change(function() { - if (this.files.length) { - var f = this.files[0], - fr = new FileReader(); - if (f.type.substr(0,5) !== "image") { - alert(_this.renkan.translate("This file is not an image")); - return; - } - if (f.size > (Rkns.Renderer._IMAGE_MAX_KB * 1024)) { - alert(_this.renkan.translate("Image size must be under ")+Rkns.Renderer._IMAGE_MAX_KB+_this.renkan.translate("KB")); - return; - } - fr.onload = function(e) { - _this.editor_$.find(".Rk-Edit-Image").val(e.target.result); - onFieldChange(); - } - fr.readAsDataURL(f); - } + if (this.files.length) { + var f = this.files[0], + fr = new FileReader(); + if (f.type.substr(0,5) !== "image") { + alert(_this.renkan.translate("This file is not an image")); + return; + } + if (f.size > (Rkns.Renderer._IMAGE_MAX_KB * 1024)) { + alert(_this.renkan.translate("Image size must be under ")+Rkns.Renderer._IMAGE_MAX_KB+_this.renkan.translate("KB")); + return; + } + fr.onload = function(e) { + _this.editor_$.find(".Rk-Edit-Image").val(e.target.result); + onFieldChange(); + } + fr.readAsDataURL(f); + } }); this.editor_$.find(".Rk-Edit-Title")[0].focus(); @@ -827,53 +827,53 @@ this.editor_$.find(".Rk-Edit-ColorPicker-Wrapper").hover( function(_e) { - _e.preventDefault(); - _picker.show(); - }, + _e.preventDefault(); + _picker.show(); + }, function(_e) { - _e.preventDefault(); - _picker.hide(); - } + _e.preventDefault(); + _picker.hide(); + } ); _picker.find("li").hover( function(_e) { - _e.preventDefault(); - _this.editor_$.find(".Rk-Edit-Color").css("background", $(this).attr("data-color")); - }, + _e.preventDefault(); + _this.editor_$.find(".Rk-Edit-Color").css("background", $(this).attr("data-color")); + }, function(_e) { - _e.preventDefault(); - _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER(_this.renkan)).get("color")) - } + _e.preventDefault(); + _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER(_this.renkan)).get("color")) + } ).click(function(_e) { - _e.preventDefault(); + _e.preventDefault(); if (_this.renderer.isEditable()) { - _model.set("color", $(this).attr("data-color")); - _picker.hide(); - paper.view.draw(); + _model.set("color", $(this).attr("data-color")); + _picker.hide(); + paper.view.draw(); } else { - closeEditor(); + closeEditor(); } }); function shiftSize(n) { - if (_this.renderer.isEditable()) { - var _newsize = n+(_model.get("size") || 0); - _this.editor_$.find(".Rk-Edit-Size-Value").text((_newsize > 0 ? "+" : "") + _newsize); - _model.set("size", _newsize); - paper.view.draw(); - } else { - closeEditor(); - } + if (_this.renderer.isEditable()) { + var _newsize = n+(_model.get("size") || 0); + _this.editor_$.find(".Rk-Edit-Size-Value").text((_newsize > 0 ? "+" : "") + _newsize); + _model.set("size", _newsize); + paper.view.draw(); + } else { + closeEditor(); + } } this.editor_$.find(".Rk-Edit-Size-Down").click(function() { - shiftSize(-1); - return false; + shiftSize(-1); + return false; }); this.editor_$.find(".Rk-Edit-Size-Up").click(function() { - shiftSize(1); - return false; + shiftSize(1); + return false; }); } this.editor_$.find("img").load(function() { @@ -946,7 +946,7 @@ this.editor_$ .html(_template({ edge: { - has_creator: !!_model.get("created_by"), + has_creator: !!_model.get("created_by"), title: _model.get("title"), uri: _model.get("uri"), short_uri: Rkns.Renderer.shortenText((_model.get("uri") || "").replace(/^(https?:\/\/)?(www\.)?/,'').replace(/\/$/,''),40), @@ -964,89 +964,89 @@ })); this.redraw(); var _this = this, - closeEditor = function() { - _this.renderer.removeRepresentation(_this); - paper.view.draw(); - } + closeEditor = function() { + _this.renderer.removeRepresentation(_this); + paper.view.draw(); + } this.editor_$.find(".Rk-CloseX").click(closeEditor); if (this.renderer.isEditable()) { - - var onFieldChange = Rkns._(function() { - Rkns._(function() { - if (_this.renderer.isEditable()) { - _this.editor_$.find(".Rk-Edit-Goto").attr("href",_this.editor_$.find(".Rk-Edit-URI").val()); - var _data = { - title: _this.editor_$.find(".Rk-Edit-Title").val(), - uri: _this.editor_$.find(".Rk-Edit-URI").val() - } - _model.set(_data); - paper.view.draw(); - } else { - closeEditor(); - } - }).defer(); - }).throttle(500); - - this.editor_$.on("keyup", function(_e) { - if (_e.keyCode === 27) { - closeEditor(); - } - }); - + + var onFieldChange = Rkns._(function() { + Rkns._(function() { + if (_this.renderer.isEditable()) { + _this.editor_$.find(".Rk-Edit-Goto").attr("href",_this.editor_$.find(".Rk-Edit-URI").val()); + var _data = { + title: _this.editor_$.find(".Rk-Edit-Title").val(), + uri: _this.editor_$.find(".Rk-Edit-URI").val() + } + _model.set(_data); + paper.view.draw(); + } else { + closeEditor(); + } + }).defer(); + }).throttle(500); + + this.editor_$.on("keyup", function(_e) { + if (_e.keyCode === 27) { + closeEditor(); + } + }); + this.editor_$.find("input").on("keyup change paste", onFieldChange); this.editor_$.find(".Rk-Edit-Vocabulary").change(function() { - var e = $(this), - v = e.val(); - if (v) { - _this.editor_$.find(".Rk-Edit-Title").val(e.find(":selected").text()); - _this.editor_$.find(".Rk-Edit-URI").val(v); - onFieldChange(); - } + var e = $(this), + v = e.val(); + if (v) { + _this.editor_$.find(".Rk-Edit-Title").val(e.find(":selected").text()); + _this.editor_$.find(".Rk-Edit-URI").val(v); + onFieldChange(); + } }); this.editor_$.find(".Rk-Edit-Direction").click(function() { - if (_this.renderer.isEditable()) { - _model.set({ - from: _model.get("to"), - to: _model.get("from") - }); - _this.draw(); - } else { - closeEditor(); - } + if (_this.renderer.isEditable()) { + _model.set({ + from: _model.get("to"), + to: _model.get("from") + }); + _this.draw(); + } else { + closeEditor(); + } }); var _picker = _this.editor_$.find(".Rk-Edit-ColorPicker"); this.editor_$.find(".Rk-Edit-ColorPicker-Wrapper").hover( function(_e) { - _e.preventDefault(); - _picker.show(); - }, + _e.preventDefault(); + _picker.show(); + }, function(_e) { - _e.preventDefault(); - _picker.hide(); - } + _e.preventDefault(); + _picker.hide(); + } ); _picker.find("li").hover( function(_e) { - _e.preventDefault(); - _this.editor_$.find(".Rk-Edit-Color").css("background", $(this).attr("data-color")); - }, + _e.preventDefault(); + _this.editor_$.find(".Rk-Edit-Color").css("background", $(this).attr("data-color")); + }, function(_e) { - _e.preventDefault(); - _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER(_this.renkan)).get("color")) - } + _e.preventDefault(); + _this.editor_$.find(".Rk-Edit-Color").css("background", _model.get("color") || (_model.get("created_by") || Rkns.Renderer._USER_PLACEHOLDER(_this.renkan)).get("color")) + } ).click(function(_e) { - _e.preventDefault(); + _e.preventDefault(); if (_this.renderer.isEditable()) { - _model.set("color", $(this).attr("data-color")); - _picker.hide(); - paper.view.draw(); + _model.set("color", $(this).attr("data-color")); + _picker.hide(); + paper.view.draw(); } else { - closeEditor(); + closeEditor(); } }); } @@ -1084,22 +1084,22 @@ Rkns.Renderer._NodeButton = Rkns.Utils.inherit(Rkns.Renderer._BaseButton); Rkns.Renderer._NodeButton.prototype.setSectorSize = function() { - var sectorInner = this.source_representation.circle_radius; - if (sectorInner !== this.lastSectorInner) { - if (this.sector) { - this.sector.destroy(); - } - this.sector = this.renderer.drawSector( - this, 1 + sectorInner, - Rkns.Renderer._NODE_BUTTON_WIDTH + sectorInner, - this.startAngle, - this.endAngle, - 1, - this.imageName, - this.renkan.translate(this.text) - ); - this.lastSectorInner = sectorInner; - } + var sectorInner = this.source_representation.circle_radius; + if (sectorInner !== this.lastSectorInner) { + if (this.sector) { + this.sector.destroy(); + } + this.sector = this.renderer.drawSector( + this, 1 + sectorInner, + Rkns.Renderer._NODE_BUTTON_WIDTH + sectorInner, + this.startAngle, + this.endAngle, + 1, + this.imageName, + this.renkan.translate(this.text) + ); + this.lastSectorInner = sectorInner; + } } /* */ @@ -1158,11 +1158,11 @@ Rkns.Renderer.NodeLinkButton.prototype.mousedown = function(_event, _isTouch) { if (this.renderer.isEditable()) { - var _off = this.renderer.canvas_$.offset(), - _point = new paper.Point([ - _event.pageX - _off.left, - _event.pageY - _off.top - ]); + var _off = this.renderer.canvas_$.offset(), + _point = new paper.Point([ + _event.pageX - _off.left, + _event.pageY - _off.top + ]); this.renderer.click_target = null; this.renderer.removeRepresentationsOfType("editor"); this.renderer.addTempEdge(this.source_representation, _point); @@ -1183,11 +1183,11 @@ } Rkns.Renderer.NodeEnlargeButton.prototype.mouseup = function() { - var _newsize = 1 + (this.source_representation.model.get("size") || 0); - this.source_representation.model.set("size", _newsize); - this.source_representation.select(); - this.select(); - paper.view.draw(); + var _newsize = 1 + (this.source_representation.model.get("size") || 0); + this.source_representation.model.set("size", _newsize); + this.source_representation.select(); + this.select(); + paper.view.draw(); } /* */ @@ -1204,11 +1204,11 @@ } Rkns.Renderer.NodeShrinkButton.prototype.mouseup = function() { - var _newsize = -1 + (this.source_representation.model.get("size") || 0); - this.source_representation.model.set("size", _newsize); - this.source_representation.select(); - this.select(); - paper.view.draw(); + var _newsize = -1 + (this.source_representation.model.get("size") || 0); + this.source_representation.model.set("size", _newsize); + this.source_representation.select(); + this.select(); + paper.view.draw(); } /* */ @@ -1249,12 +1249,12 @@ Rkns.Renderer.MiniFrame = Rkns.Utils.inherit(Rkns.Renderer._BaseRepresentation); Rkns.Renderer.MiniFrame.prototype.paperShift = function(_delta) { - this.renderer.offset = this.renderer.offset.subtract(_delta.divide(this.renderer.minimap.scale).multiply(this.renderer.scale)); + this.renderer.offset = this.renderer.offset.subtract(_delta.divide(this.renderer.minimap.scale).multiply(this.renderer.scale)); this.renderer.redraw(); } Rkns.Renderer.MiniFrame.prototype.mouseup = function(_delta) { - this.renderer.click_target = null; + this.renderer.click_target = null; this.renderer.is_dragging = false; } @@ -1282,38 +1282,38 @@ this.buttons_layer = new paper.Layer(); if (_renkan.options.show_minimap) { - this.minimap = { - background_layer: new paper.Layer(), - edge_layer: new paper.Layer(), - node_layer: new paper.Layer(), - node_group: new paper.Group(), - size: new paper.Size( _renkan.options.minimap_width, _renkan.options.minimap_height ) - } - - this.minimap.background_layer.activate(); - this.minimap.topleft = paper.view.bounds.bottomRight.subtract(this.minimap.size); - this.minimap.rectangle = new paper.Path.Rectangle(this.minimap.topleft.subtract([2,2]), this.minimap.size.add([4,4])); - this.minimap.rectangle.fillColor = _renkan.options.minimap_background_color; - this.minimap.rectangle.strokeColor = _renkan.options.minimap_border_color; - this.minimap.rectangle.strokeWidth = 4; - this.minimap.offset = new paper.Point(this.minimap.size.divide(2)); - this.minimap.scale = .1; - - this.minimap.node_layer.activate(); - this.minimap.cliprectangle = new paper.Path.Rectangle(this.minimap.topleft, this.minimap.size); - this.minimap.node_group.addChild(this.minimap.cliprectangle); - this.minimap.node_group.clipped = true; - this.minimap.miniframe = new paper.Path.Rectangle(this.minimap.topleft, this.minimap.size); - this.minimap.node_group.addChild(this.minimap.miniframe); - this.minimap.miniframe.fillColor = '#c0c0ff'; - this.minimap.miniframe.opacity = .3; - this.minimap.miniframe.strokeColor = '#000080'; - this.minimap.miniframe.strokeWidth = 3; - this.minimap.miniframe.__representation = new Rkns.Renderer.MiniFrame(this, null); + this.minimap = { + background_layer: new paper.Layer(), + edge_layer: new paper.Layer(), + node_layer: new paper.Layer(), + node_group: new paper.Group(), + size: new paper.Size( _renkan.options.minimap_width, _renkan.options.minimap_height ) + } + + this.minimap.background_layer.activate(); + this.minimap.topleft = paper.view.bounds.bottomRight.subtract(this.minimap.size); + this.minimap.rectangle = new paper.Path.Rectangle(this.minimap.topleft.subtract([2,2]), this.minimap.size.add([4,4])); + this.minimap.rectangle.fillColor = _renkan.options.minimap_background_color; + this.minimap.rectangle.strokeColor = _renkan.options.minimap_border_color; + this.minimap.rectangle.strokeWidth = 4; + this.minimap.offset = new paper.Point(this.minimap.size.divide(2)); + this.minimap.scale = .1; + + this.minimap.node_layer.activate(); + this.minimap.cliprectangle = new paper.Path.Rectangle(this.minimap.topleft, this.minimap.size); + this.minimap.node_group.addChild(this.minimap.cliprectangle); + this.minimap.node_group.clipped = true; + this.minimap.miniframe = new paper.Path.Rectangle(this.minimap.topleft, this.minimap.size); + this.minimap.node_group.addChild(this.minimap.miniframe); + this.minimap.miniframe.fillColor = '#c0c0ff'; + this.minimap.miniframe.opacity = .3; + this.minimap.miniframe.strokeColor = '#000080'; + this.minimap.miniframe.strokeWidth = 3; + this.minimap.miniframe.__representation = new Rkns.Renderer.MiniFrame(this, null); } this.throttledPaperDraw = Rkns._(function() { - paper.view.draw(); + paper.view.draw(); }).throttle(100); this.bundles = []; @@ -1330,160 +1330,160 @@ this.imageCache = {}; ['edit', 'remove', 'link', 'enlarge', 'shrink'].forEach(function(imgname) { - var img = new Image(); - img.src = _renkan.options.static_url + 'img/' + imgname + '.png'; - _this.imageCache[imgname] = img; + var img = new Image(); + img.src = _renkan.options.static_url + 'img/' + imgname + '.png'; + _this.imageCache[imgname] = img; }); var throttledMouseMove = _.throttle(function(_event, _isTouch) { - _this.onMouseMove(_event, _isTouch); + _this.onMouseMove(_event, _isTouch); }, Rkns.Renderer._MOUSEMOVE_RATE); this.canvas_$.on({ - mousedown: function(_event) { - _event.preventDefault(); - _this.onMouseDown(_event, false); - }, - mousemove: function(_event) { - _event.preventDefault(); - throttledMouseMove(_event, false); - }, - mouseup: function(_event) { - _event.preventDefault(); - _this.onMouseUp(_event, false); - }, - mousewheel: function(_event, _delta) { - _event.preventDefault(); - if (_allowScroll) { - _this.onScroll(_event, _delta); - } - }, - touchstart: function(_event) { - _event.preventDefault(); - var _touches = _event.originalEvent.touches[0]; - if ( - _renkan.options.allow_double_click - && new Date() - _lastTap < Rkns.Renderer._DOUBLETAP_DELAY - && ( Math.pow(_lastTapX - _touches.pageX, 2) + Math.pow(_lastTapY - _touches.pageY, 2) < Rkns.Renderer._DOUBLETAP_DISTANCE ) - ) { - _lastTap = 0; - _this.onDoubleClick(_touches); - } else { - _lastTap = new Date(); - _lastTapX = _touches.pageX; - _lastTapY = _touches.pageY; - _originalScale = _this.scale; - _zooming = false; - _this.onMouseDown(_touches, true); - } - }, - touchmove: function(_event) { - _event.preventDefault(); - _lastTap = 0; - if (_event.originalEvent.touches.length == 1) { - _this.onMouseMove(_event.originalEvent.touches[0], true); - } else { - if (!_zooming) { - _this.onMouseUp(_event.originalEvent.touches[0], true); - _this.click_target = null; - _this.is_dragging = false; - _zooming = true; - } - if (_event.originalEvent.scale === "undefined") { - return; - } - var _newScale = _event.originalEvent.scale * _originalScale, - _scaleRatio = _newScale / _this.scale, - _newOffset = new paper.Point([ - _this.canvas_$.width(), - _this.canvas_$.height() - ]).multiply( .5 * ( 1 - _scaleRatio ) ).add(_this.offset.multiply( _scaleRatio )); - _this.setScale(_newScale, _this.offset); - } - }, - touchend: function(_event) { - _event.preventDefault(); - _this.onMouseUp(_event.originalEvent.changedTouches[0], true); - }, - dblclick: function(_event) { - _event.preventDefault(); - if (_renkan.options.allow_double_click) { - _this.onDoubleClick(_event); - } - }, - mouseleave: function(_event) { - _event.preventDefault(); - _this.onMouseUp(_event, false); - _this.click_target = null; - _this.is_dragging = false; - }, - dragover: function(_event) { - _event.preventDefault(); - }, - dragenter: function(_event) { - _event.preventDefault(); - _allowScroll = false; - }, - dragleave: function(_event) { - _event.preventDefault(); - _allowScroll = true; - }, - drop: function(_event) { - _event.preventDefault(); - _allowScroll = true; - var res = {}; - Rkns._(_event.originalEvent.dataTransfer.types).each(function(t) { - try { - res[t] = _event.originalEvent.dataTransfer.getData(t); - } catch(e) {} - }); - var text = _event.originalEvent.dataTransfer.getData("Text"); - if (typeof text === "string") { - switch(text[0]) { - case "{": - case "[": - try { - var data = JSON.parse(text); - _(res).extend(data); - } - catch(e) { - if (!res["text/plain"]) { - res["text/plain"] = text; - } - } - break; - case "<": - if (!res["text/html"]) { - res["text/html"] = text; - } - break; - default: - if (!res["text/plain"]) { - res["text/plain"] = text; - } - } - } - var url = _event.originalEvent.dataTransfer.getData("URL"); - if (url && !res["text/uri-list"]) { - res["text/uri-list"] = url; - } - _this.dropData(res, _event.originalEvent); - } + mousedown: function(_event) { + _event.preventDefault(); + _this.onMouseDown(_event, false); + }, + mousemove: function(_event) { + _event.preventDefault(); + throttledMouseMove(_event, false); + }, + mouseup: function(_event) { + _event.preventDefault(); + _this.onMouseUp(_event, false); + }, + mousewheel: function(_event, _delta) { + _event.preventDefault(); + if (_allowScroll) { + _this.onScroll(_event, _delta); + } + }, + touchstart: function(_event) { + _event.preventDefault(); + var _touches = _event.originalEvent.touches[0]; + if ( + _renkan.options.allow_double_click + && new Date() - _lastTap < Rkns.Renderer._DOUBLETAP_DELAY + && ( Math.pow(_lastTapX - _touches.pageX, 2) + Math.pow(_lastTapY - _touches.pageY, 2) < Rkns.Renderer._DOUBLETAP_DISTANCE ) + ) { + _lastTap = 0; + _this.onDoubleClick(_touches); + } else { + _lastTap = new Date(); + _lastTapX = _touches.pageX; + _lastTapY = _touches.pageY; + _originalScale = _this.scale; + _zooming = false; + _this.onMouseDown(_touches, true); + } + }, + touchmove: function(_event) { + _event.preventDefault(); + _lastTap = 0; + if (_event.originalEvent.touches.length == 1) { + _this.onMouseMove(_event.originalEvent.touches[0], true); + } else { + if (!_zooming) { + _this.onMouseUp(_event.originalEvent.touches[0], true); + _this.click_target = null; + _this.is_dragging = false; + _zooming = true; + } + if (_event.originalEvent.scale === "undefined") { + return; + } + var _newScale = _event.originalEvent.scale * _originalScale, + _scaleRatio = _newScale / _this.scale, + _newOffset = new paper.Point([ + _this.canvas_$.width(), + _this.canvas_$.height() + ]).multiply( .5 * ( 1 - _scaleRatio ) ).add(_this.offset.multiply( _scaleRatio )); + _this.setScale(_newScale, _this.offset); + } + }, + touchend: function(_event) { + _event.preventDefault(); + _this.onMouseUp(_event.originalEvent.changedTouches[0], true); + }, + dblclick: function(_event) { + _event.preventDefault(); + if (_renkan.options.allow_double_click) { + _this.onDoubleClick(_event); + } + }, + mouseleave: function(_event) { + _event.preventDefault(); + _this.onMouseUp(_event, false); + _this.click_target = null; + _this.is_dragging = false; + }, + dragover: function(_event) { + _event.preventDefault(); + }, + dragenter: function(_event) { + _event.preventDefault(); + _allowScroll = false; + }, + dragleave: function(_event) { + _event.preventDefault(); + _allowScroll = true; + }, + drop: function(_event) { + _event.preventDefault(); + _allowScroll = true; + var res = {}; + Rkns._(_event.originalEvent.dataTransfer.types).each(function(t) { + try { + res[t] = _event.originalEvent.dataTransfer.getData(t); + } catch(e) {} + }); + var text = _event.originalEvent.dataTransfer.getData("Text"); + if (typeof text === "string") { + switch(text[0]) { + case "{": + case "[": + try { + var data = JSON.parse(text); + _(res).extend(data); + } + catch(e) { + if (!res["text/plain"]) { + res["text/plain"] = text; + } + } + break; + case "<": + if (!res["text/html"]) { + res["text/html"] = text; + } + break; + default: + if (!res["text/plain"]) { + res["text/plain"] = text; + } + } + } + var url = _event.originalEvent.dataTransfer.getData("URL"); + if (url && !res["text/uri-list"]) { + res["text/uri-list"] = url; + } + _this.dropData(res, _event.originalEvent); + } }); this.editor_$.find(".Rk-ZoomOut").click(function() { - var _newScale = _this.scale * Math.SQRT1_2, - _offset = new paper.Point([ - _this.canvas_$.width(), - _this.canvas_$.height() - ]).multiply( .5 * ( 1 - Math.SQRT1_2 ) ).add(_this.offset.multiply( Math.SQRT1_2 )); + var _newScale = _this.scale * Math.SQRT1_2, + _offset = new paper.Point([ + _this.canvas_$.width(), + _this.canvas_$.height() + ]).multiply( .5 * ( 1 - Math.SQRT1_2 ) ).add(_this.offset.multiply( Math.SQRT1_2 )); _this.setScale( _newScale, _offset ); }); this.editor_$.find(".Rk-ZoomIn").click(function() { - var _newScale = _this.scale * Math.SQRT2, - _offset = new paper.Point([ - _this.canvas_$.width(), - _this.canvas_$.height() - ]).multiply( .5 * ( 1 - Math.SQRT2 ) ).add(_this.offset.multiply( Math.SQRT2 )); + var _newScale = _this.scale * Math.SQRT2, + _offset = new paper.Point([ + _this.canvas_$.width(), + _this.canvas_$.height() + ]).multiply( .5 * ( 1 - Math.SQRT2 ) ).add(_this.offset.multiply( Math.SQRT2 )); _this.setScale( _newScale, _offset ); }); this.$.find(".Rk-CurrentUser").mouseenter( @@ -1532,45 +1532,45 @@ } }); this.$.find(".Rk-Bookmarklet-Button") - .attr("href","javascript:" + Rkns.Renderer._BOOKMARKLET_CODE(_renkan)) - .click(function(){ - _this.notif_$ - .text(_renkan.translate("Drag this button to your bookmark bar. When on a third-party website, click it to enable drag-and-drop from the website to Renkan.")) - .fadeIn() - .delay(5000) - .fadeOut(); - return false; - }); + .attr("href","javascript:" + Rkns.Renderer._BOOKMARKLET_CODE(_renkan)) + .click(function(){ + _this.notif_$ + .text(_renkan.translate("Drag this button to your bookmark bar. When on a third-party website, click it to enable drag-and-drop from the website to Renkan.")) + .fadeIn() + .delay(5000) + .fadeOut(); + return false; + }); this.$.find(".Rk-TopBar-Button").mouseover(function() { Rkns.$(this).find(".Rk-TopBar-Tooltip").show(); }).mouseout(function() { Rkns.$(this).find(".Rk-TopBar-Tooltip").hide(); }); this.$.find(".Rk-Fold-Bins").click(function() { - var bins = _renkan.$.find(".Rk-Bins"); - if (bins.offset().left < 0) { - bins.animate({left: 0},250); - _this.$.animate({left: 300},250,function() { - var w = _this.$.width(); - paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); - }); - $(this).html("«"); - } else { - bins.animate({left: -300},250); - _this.$.animate({left: 0},250,function() { - var w = _this.$.width(); - paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); - }); - $(this).html("»"); - } + var bins = _renkan.$.find(".Rk-Bins"); + if (bins.offset().left < 0) { + bins.animate({left: 0},250); + _this.$.animate({left: 300},250,function() { + var w = _this.$.width(); + paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); + }); + $(this).html("«"); + } else { + bins.animate({left: -300},250); + _this.$.animate({left: 0},250,function() { + var w = _this.$.width(); + paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); + }); + $(this).html("»"); + } }); paper.view.onResize = function(_event) { - _this.offset = _this.offset.add(_event.delta.divide(2)); - if (_this.minimap) { - _this.minimap.topleft = paper.view.bounds.bottomRight.subtract(_this.minimap.size) - _this.minimap.rectangle.fitBounds(_this.minimap.topleft.subtract([2,2]), _this.minimap.size.add([4,4])); - _this.minimap.cliprectangle.fitBounds(_this.minimap.topleft, _this.minimap.size); + _this.offset = _this.offset.add(_event.delta.divide(2)); + if (_this.minimap) { + _this.minimap.topleft = paper.view.bounds.bottomRight.subtract(_this.minimap.size) + _this.minimap.rectangle.fitBounds(_this.minimap.topleft.subtract([2,2]), _this.minimap.size.add([4,4])); + _this.minimap.cliprectangle.fitBounds(_this.minimap.topleft, _this.minimap.size); } _this.redraw(); } @@ -1616,31 +1616,31 @@ }); if (_renkan.options.size_bug_fix) { - window.setTimeout( - function() { - var w = _this.$.width(), - h = _this.$.height(); - if (_renkan.options.show_top_bar) { - h -= _this.$.find(".Rk-TopBar").height(); - } - _this.canvas_$.attr({ - width: w, - height: h - }); - - paper.view.viewSize = new paper.Size([w, h]); - _this.autoScale(); - }, - 500 - ); + window.setTimeout( + function() { + var w = _this.$.width(), + h = _this.$.height(); + if (_renkan.options.show_top_bar) { + h -= _this.$.find(".Rk-TopBar").height(); + } + _this.canvas_$.attr({ + width: w, + height: h + }); + + paper.view.viewSize = new paper.Size([w, h]); + _this.autoScale(); + }, + 500 + ); } this.redraw(); if (this.minimap) { - window.setInterval(function() { - _this.rescaleMinimap() - }, 2000); + window.setInterval(function() { + _this.rescaleMinimap() + }, 2000); } } @@ -1667,7 +1667,7 @@ Rkns.Renderer.Scene.prototype.drawSector = function(_repr, _inR, _outR, _startAngle, _endAngle, _padding, _imgname, _caption) { var _options = this.renkan.options, - _startRads = _startAngle * Math.PI / 180, + _startRads = _startAngle * Math.PI / 180, _endRads = _endAngle * Math.PI / 180, _img = this.imageCache[_imgname], _span = _endRads - _startRads, @@ -1694,7 +1694,7 @@ _textX = Math.cos(_centerRads) * (_outR + 3), _textY = Math.sin(_centerRads) * (_outR + _options.buttons_label_font_size) + _options.buttons_label_font_size / 2, _segments = []; - this.buttons_layer.activate(); + this.buttons_layer.activate(); var _path = new paper.Path(); _path.add([_startXIn, _startYIn]); _path.arcTo([_centerXIn, _centerYIn], [_endXIn, _endYIn]); @@ -1756,14 +1756,14 @@ } } function showImage() { - var _raster = new paper.Raster(_img); - _raster.position = _imgdelta.add(_grp.position).subtract(_delta); - _grp.addChild(_raster); + var _raster = new paper.Raster(_img); + _raster.position = _imgdelta.add(_grp.position).subtract(_delta); + _grp.addChild(_raster); } if (_img.width) { - showImage(); + showImage(); } else { - Rkns.$(_img).on("load",showImage); + Rkns.$(_img).on("load",showImage); } return _res @@ -1794,33 +1794,33 @@ } Rkns.Renderer.Scene.prototype.isEditable = function() { - return (this.renkan.options.editor_mode && !this.renkan.read_only) + return (this.renkan.options.editor_mode && !this.renkan.read_only) } Rkns.Renderer.Scene.prototype.onStatusChange = function() { - var savebtn = this.$.find(".Rk-Save-Button"), - tip = savebtn.find(".Rk-TopBar-Tooltip-Contents"); - if (this.renkan.read_only) { - savebtn.removeClass("disabled Rk-Save-Online").addClass("Rk-Save-ReadOnly"); - tip.text(this.renkan.translate("Connection lost")); - } else { - if (this.renkan.options.snapshot_mode) { - savebtn.removeClass("Rk-Save-ReadOnly Rk-Save-Online"); - tip.text(this.renkan.translate("Archive Project")); - } else { - savebtn.removeClass("disabled Rk-Save-ReadOnly").addClass("Rk-Save-Online"); - tip.text(this.renkan.translate("Auto-save enabled")); - } - } + var savebtn = this.$.find(".Rk-Save-Button"), + tip = savebtn.find(".Rk-TopBar-Tooltip-Contents"); + if (this.renkan.read_only) { + savebtn.removeClass("disabled Rk-Save-Online").addClass("Rk-Save-ReadOnly"); + tip.text(this.renkan.translate("Connection lost")); + } else { + if (this.renkan.options.snapshot_mode) { + savebtn.removeClass("Rk-Save-ReadOnly Rk-Save-Online"); + tip.text(this.renkan.translate("Archive Project")); + } else { + savebtn.removeClass("disabled Rk-Save-ReadOnly").addClass("Rk-Save-Online"); + tip.text(this.renkan.translate("Auto-save enabled")); + } + } } Rkns.Renderer.Scene.prototype.setScale = function(_newScale, _offset) { - if (_newScale > Rkns.Renderer._MIN_SCALE && _newScale < Rkns.Renderer._MAX_SCALE) { - this.scale = _newScale; - if (_offset) { - this.offset = _offset - } - this.redraw(); + if (_newScale > Rkns.Renderer._MIN_SCALE && _newScale < Rkns.Renderer._MAX_SCALE) { + this.scale = _newScale; + if (_offset) { + this.offset = _offset + } + this.redraw(); } } @@ -1834,7 +1834,7 @@ _maxx = Math.max.apply(Math, _xx), _maxy = Math.max.apply(Math, _yy); var _scale = Math.max(Rkns.Renderer._MIN_SCALE, Math.min(Rkns.Renderer._MAX_SCALE, (paper.view.size.width - 2 * Rkns.Renderer._AUTOSCALE_MARGIN) / (_maxx - _minx), (paper.view.size.height - 2 * Rkns.Renderer._AUTOSCALE_MARGIN) / (_maxy - _miny))); - this.setScale(_scale, paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale))); + this.setScale(_scale, paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale))); } if (nodes.length === 1) { this.setScale(1, paper.view.center.subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y]))); @@ -1842,9 +1842,9 @@ } Rkns.Renderer.Scene.prototype.redrawMiniframe = function() { - var topleft = this.toMinimapCoords(this.toModelCoords(new paper.Point([0,0]))), - bottomright = this.toMinimapCoords(this.toModelCoords(paper.view.bounds.bottomRight)); - this.minimap.miniframe.fitBounds(topleft, bottomright); + var topleft = this.toMinimapCoords(this.toModelCoords(new paper.Point([0,0]))), + bottomright = this.toMinimapCoords(this.toModelCoords(paper.view.bounds.bottomRight)); + this.minimap.miniframe.fitBounds(topleft, bottomright); } Rkns.Renderer.Scene.prototype.rescaleMinimap = function() { @@ -1857,16 +1857,16 @@ _maxx = Math.max.apply(Math, _xx), _maxy = Math.max.apply(Math, _yy); var _scale = Math.min( - this.scale * .8 * this.renkan.options.minimap_width / paper.view.bounds.width, - this.scale * .8 * this.renkan.options.minimap_height / paper.view.bounds.height, - ( this.renkan.options.minimap_width - 2 * Rkns.Renderer._MINIMAP_MARGIN ) / (_maxx - _minx), - ( this.renkan.options.minimap_height - 2 * Rkns.Renderer._MINIMAP_MARGIN ) / (_maxy - _miny) - ); + this.scale * .8 * this.renkan.options.minimap_width / paper.view.bounds.width, + this.scale * .8 * this.renkan.options.minimap_height / paper.view.bounds.height, + ( this.renkan.options.minimap_width - 2 * Rkns.Renderer._MINIMAP_MARGIN ) / (_maxx - _minx), + ( this.renkan.options.minimap_height - 2 * Rkns.Renderer._MINIMAP_MARGIN ) / (_maxy - _miny) + ); this.minimap.offset = this.minimap.size.divide(2).subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(_scale)); this.minimap.scale = _scale; } if (nodes.length === 1) { - this.minimap.scale = .1; + this.minimap.scale = .1; this.minimap.offset = this.minimap.size.divide(2).subtract(new paper.Point([nodes.at(0).get("position").x, nodes.at(0).get("position").y]).multiply(this.minimap.scale)); } this.redraw(); @@ -1963,10 +1963,10 @@ Rkns.Renderer.Scene.prototype.redraw = function() { Rkns._(this.representations).each(function(_representation) { - _representation.redraw(true); + _representation.redraw(true); }); if (this.minimap) { - this.redrawMiniframe(); + this.redrawMiniframe(); } paper.view.draw(); } @@ -1998,20 +1998,20 @@ } Rkns.Renderer.Scene.prototype.paperShift = function(_delta) { - this.offset = this.offset.add(_delta); + this.offset = this.offset.add(_delta); this.redraw(); } Rkns.Renderer.Scene.prototype.onMouseMove = function(_event) { var _off = this.canvas_$.offset(), - _point = new paper.Point([ + _point = new paper.Point([ _event.pageX - _off.left, _event.pageY - _off.top ]), _delta = _point.subtract(this.last_point); - this.last_point = _point; + this.last_point = _point; if (!this.is_dragging && this.mouse_down && _delta.length > Rkns.Renderer._MIN_DRAG_DISTANCE) { - this.is_dragging = true; + this.is_dragging = true; } var _hitResult = paper.project.hitTest(_point); if (this.is_dragging) { @@ -2028,7 +2028,7 @@ Rkns.Renderer.Scene.prototype.onMouseDown = function(_event, _isTouch) { var _off = this.canvas_$.offset(), - _point = new paper.Point([ + _point = new paper.Point([ _event.pageX - _off.left, _event.pageY - _off.top ]); @@ -2075,7 +2075,7 @@ } Rkns.Renderer.Scene.prototype.onMouseUp = function(_event, _isTouch) { - this.mouse_down = false; + this.mouse_down = false; if (this.click_target) { var _off = this.canvas_$.offset(); this.click_target.mouseup( @@ -2091,7 +2091,7 @@ this.click_target = null; this.is_dragging = false; if (_isTouch) { - this.unselectAll(); + this.unselectAll(); } } paper.view.draw(); @@ -2106,9 +2106,9 @@ _event.pageY - _off.top ]).subtract(this.offset).multiply( Math.SQRT2 - 1 ); if (this.totalScroll > 0) { - this.setScale( this.scale * Math.SQRT2, this.offset.subtract(_delta) ); + this.setScale( this.scale * Math.SQRT2, this.offset.subtract(_delta) ); } else { - this.setScale( this.scale * Math.SQRT1_2, this.offset.add(_delta.divide(Math.SQRT2))); + this.setScale( this.scale * Math.SQRT1_2, this.offset.add(_delta.divide(Math.SQRT2))); } this.totalScroll = 0; } @@ -2141,86 +2141,86 @@ } Rkns.Renderer.Scene.prototype.dropData = function(_data, _event) { - if (!this.isEditable()) { - return; - } - if (_data["text/json"] || _data["application/json"]) { - try { - var jsondata = JSON.parse(_data["text/json"] || _data["application/json"]); - _(_data).extend(jsondata); - } - catch(e) {} - } - var newNode = {}; - switch(_data["text/x-iri-specific-site"]) { - case "twitter": - var snippet = Rkns.$('
').html(_data["text/x-iri-selected-html"]), - tweetdiv = snippet.find(".tweet") - newNode.title = _renkan.translate("Tweet by ") + tweetdiv.attr("data-name"); - newNode.uri = "http://twitter.com/" + tweetdiv.attr("data-screen-name") + "/status/" + tweetdiv.attr("data-tweet-id"); - newNode.image = tweetdiv.find(".avatar").attr("src"); - newNode.description = tweetdiv.find(".js-tweet-text:first").text(); - break; - case "google": - var snippet = Rkns.$('
').html(_data["text/x-iri-selected-html"]); - newNode.title = snippet.find("h3:first").text().trim(); - newNode.uri = snippet.find("h3 a").attr("href"); - newNode.description = snippet.find(".st:first").text().trim(); - break; - case undefined: - default: - if (_data["text/x-iri-source-uri"]) { - newNode.uri = _data["text/x-iri-source-uri"]; - } - if (_data["text/plain"] || _data["text/x-iri-selected-text"]) { - newNode.description = (_data["text/plain"] || _data["text/x-iri-selected-text"]).replace(/[\s\n]+/gm,' ').trim(); - } - if (_data["text/html"] || _data["text/x-iri-selected-html"]) { - var snippet = Rkns.$('
').html(_data["text/html"] || _data["text/x-iri-selected-html"]); - var _imgs = snippet.find("img"); - if (_imgs.length) { - newNode.image = _imgs[0].src; - } - var _as = snippet.find("a"); - if (_as.length) { - newNode.uri = _as[0].href; - } - newNode.title = snippet.find("[title]").attr("title") || newNode.title; - newNode.description = snippet.text().replace(/[\s\n]+/gm,' ').trim(); - } - if (_data["text/uri-list"]) { - newNode.uri = _data["text/uri-list"]; - } - if (_data["text/x-moz-url"] && !newNode.title) { - newNode.title = (_data["text/x-moz-url"].split("\n")[1] || "").trim(); - if (newNode.title === newNode.uri) { - newNode.title = false; - } - } - if (_data["text/x-iri-source-title"] && !newNode.title) { - newNode.title = _data["text/x-iri-source-title"]; - } - if (_data["text/html"] || _data["text/x-iri-selected-html"]) { - newNode.image = snippet.find("[data-image]").attr("data-image") || newNode.image; - newNode.uri = snippet.find("[data-uri]").attr("data-uri") || newNode.uri; - newNode.title = snippet.find("[data-title]").attr("data-title") || newNode.title; - newNode.description = snippet.find("[data-description]").attr("data-description") || newNode.description; - } - } - if (!newNode.title) { - newNode.title = this.renkan.translate("Dragged resource"); - } - var fields = ["title", "description", "uri", "image"]; - for (var i = 0; i < fields.length; i++) { - var f = fields[i]; - if (_data["text/x-iri-" + f] || _data[f]) { - newNode[f] = _data["text/x-iri-" + f] || _data[f]; - } - if (newNode[f] === "none" || newNode[f] === "null") { - newNode[f] = undefined; - } - } - var _off = this.canvas_$.offset(), + if (!this.isEditable()) { + return; + } + if (_data["text/json"] || _data["application/json"]) { + try { + var jsondata = JSON.parse(_data["text/json"] || _data["application/json"]); + _(_data).extend(jsondata); + } + catch(e) {} + } + var newNode = {}; + switch(_data["text/x-iri-specific-site"]) { + case "twitter": + var snippet = Rkns.$('
').html(_data["text/x-iri-selected-html"]), + tweetdiv = snippet.find(".tweet") + newNode.title = _renkan.translate("Tweet by ") + tweetdiv.attr("data-name"); + newNode.uri = "http://twitter.com/" + tweetdiv.attr("data-screen-name") + "/status/" + tweetdiv.attr("data-tweet-id"); + newNode.image = tweetdiv.find(".avatar").attr("src"); + newNode.description = tweetdiv.find(".js-tweet-text:first").text(); + break; + case "google": + var snippet = Rkns.$('
').html(_data["text/x-iri-selected-html"]); + newNode.title = snippet.find("h3:first").text().trim(); + newNode.uri = snippet.find("h3 a").attr("href"); + newNode.description = snippet.find(".st:first").text().trim(); + break; + case undefined: + default: + if (_data["text/x-iri-source-uri"]) { + newNode.uri = _data["text/x-iri-source-uri"]; + } + if (_data["text/plain"] || _data["text/x-iri-selected-text"]) { + newNode.description = (_data["text/plain"] || _data["text/x-iri-selected-text"]).replace(/[\s\n]+/gm,' ').trim(); + } + if (_data["text/html"] || _data["text/x-iri-selected-html"]) { + var snippet = Rkns.$('
').html(_data["text/html"] || _data["text/x-iri-selected-html"]); + var _imgs = snippet.find("img"); + if (_imgs.length) { + newNode.image = _imgs[0].src; + } + var _as = snippet.find("a"); + if (_as.length) { + newNode.uri = _as[0].href; + } + newNode.title = snippet.find("[title]").attr("title") || newNode.title; + newNode.description = snippet.text().replace(/[\s\n]+/gm,' ').trim(); + } + if (_data["text/uri-list"]) { + newNode.uri = _data["text/uri-list"]; + } + if (_data["text/x-moz-url"] && !newNode.title) { + newNode.title = (_data["text/x-moz-url"].split("\n")[1] || "").trim(); + if (newNode.title === newNode.uri) { + newNode.title = false; + } + } + if (_data["text/x-iri-source-title"] && !newNode.title) { + newNode.title = _data["text/x-iri-source-title"]; + } + if (_data["text/html"] || _data["text/x-iri-selected-html"]) { + newNode.image = snippet.find("[data-image]").attr("data-image") || newNode.image; + newNode.uri = snippet.find("[data-uri]").attr("data-uri") || newNode.uri; + newNode.title = snippet.find("[data-title]").attr("data-title") || newNode.title; + newNode.description = snippet.find("[data-description]").attr("data-description") || newNode.description; + } + } + if (!newNode.title) { + newNode.title = this.renkan.translate("Dragged resource"); + } + var fields = ["title", "description", "uri", "image"]; + for (var i = 0; i < fields.length; i++) { + var f = fields[i]; + if (_data["text/x-iri-" + f] || _data[f]) { + newNode[f] = _data["text/x-iri-" + f] || _data[f]; + } + if (newNode[f] === "none" || newNode[f] === "null") { + newNode[f] = undefined; + } + } + var _off = this.canvas_$.offset(), _point = new paper.Point([ _event.pageX - _off.left, _event.pageY - _off.top @@ -2239,9 +2239,9 @@ y: _coords.y } }; - var _node = this.renkan.project.addNode(_nodedata), - _repr = this.getRepresentationByModel(_node); - if (_event.type === "drop") { - _repr.openEditor(); + var _node = this.renkan.project.addNode(_nodedata), + _repr = this.getRepresentationByModel(_node); + if (_event.type === "drop") { + _repr.openEditor(); } }