equal
deleted
inserted
replaced
167 _this.onDoubleClick(_event); |
167 _this.onDoubleClick(_event); |
168 } |
168 } |
169 }, |
169 }, |
170 mouseleave: function(_event) { |
170 mouseleave: function(_event) { |
171 _event.preventDefault(); |
171 _event.preventDefault(); |
172 _this.onMouseUp(_event, false); |
172 //_this.onMouseUp(_event, false);// |
173 _this.click_target = null; |
173 _this.click_target = null; |
174 _this.is_dragging = false; |
174 _this.is_dragging = false; |
175 }, |
175 }, |
176 dragover: function(_event) { |
176 dragover: function(_event) { |
177 _event.preventDefault(); |
177 _event.preventDefault(); |
255 _this.hideNodes(false); |
255 _this.hideNodes(false); |
256 }); |
256 }); |
257 }); |
257 }); |
258 this.$.find(".Rk-ShowHiddenNodes").click( function() { |
258 this.$.find(".Rk-ShowHiddenNodes").click( function() { |
259 _this.showNodes(false); |
259 _this.showNodes(false); |
260 _this.$.find(".Rk-ShowHiddenNodes").off( "mouseleave" ); |
260 _this.$.find(".Rk-ShowHiddenNodes").off( "mouseleave" ); |
261 }); |
261 }); |
262 if(this.renkan.project.get("views").length > 0 && this.renkan.options.save_view){ |
262 if(this.renkan.project.get("views").length > 0 && this.renkan.options.save_view){ |
263 this.$.find(".Rk-ZoomSetSaved").show(); |
263 this.$.find(".Rk-ZoomSetSaved").show(); |
264 } |
264 } |
265 this.$.find(".Rk-CurrentUser").mouseenter( |
265 this.$.find(".Rk-CurrentUser").mouseenter( |
1031 _point = new paper.Point([ |
1031 _point = new paper.Point([ |
1032 _event.pageX - _off.left, |
1032 _event.pageX - _off.left, |
1033 _event.pageY - _off.top |
1033 _event.pageY - _off.top |
1034 ]); |
1034 ]); |
1035 var _hitResult = paper.project.hitTest(_point); |
1035 var _hitResult = paper.project.hitTest(_point); |
1036 |
1036 |
1037 if (!this.isEditable()) { |
1037 if (!this.isEditable()) { |
1038 if (_hitResult && typeof _hitResult.item.__representation !== "undefined") { |
1038 if (_hitResult && typeof _hitResult.item.__representation !== "undefined") { |
1039 if (_hitResult.item.__representation.model.get('uri')){ |
1039 if (_hitResult.item.__representation.model.get('uri')){ |
1040 window.open(_hitResult.item.__representation.model.get('uri'), '_blank'); |
1040 window.open(_hitResult.item.__representation.model.get('uri'), '_blank'); |
1041 } |
1041 } |
1293 e.from = idsMap[e.from]; |
1293 e.from = idsMap[e.from]; |
1294 }); |
1294 }); |
1295 _.each(projectJSON.views, function(e,i,l) { |
1295 _.each(projectJSON.views, function(e,i,l) { |
1296 delete e._id; |
1296 delete e._id; |
1297 delete e.id; |
1297 delete e.id; |
1298 |
1298 |
1299 if(e.hidden_nodes) { |
1299 if(e.hidden_nodes) { |
1300 hiddenNodes = e.hidden_nodes; |
1300 hiddenNodes = e.hidden_nodes; |
1301 e.hidden_nodes = []; |
1301 e.hidden_nodes = []; |
1302 _.each(hiddenNodes, function(h,j) { |
1302 _.each(hiddenNodes, function(h,j) { |
1303 e.hidden_nodes.push(idsMap[h]); |
1303 e.hidden_nodes.push(idsMap[h]); |