×<%-renkan.translate("Edit Edge")%>

' - + '

<%-renkan.translate("Title:")%>

' - + '<% if (options.show_edge_editor_uri) { %>

<%-renkan.translate("URI:")%>

' - + '<% if (options.properties.length) { %>

<%-renkan.translate("Choose from vocabulary:")%>

<% } } %>' - + '<% if (options.show_edge_editor_color) { %>

<%-renkan.translate("Edge color:")%>

' - + '<%= renkan.colorPicker %><%- renkan.translate("Choose color") %>

<% } %>' - + '<% if (options.show_edge_editor_direction) { %>

<%- renkan.translate("Change edge direction") %>

<% } %>' - + '<% if (options.show_edge_editor_nodes) { %>

<%-renkan.translate("From:")%><%- shortenText(edge.from_title, 25) %>

' - + '

<%-renkan.translate("To:")%><%- shortenText(edge.to_title, 25) %>

<% } %>' - + '<% if (options.show_edge_editor_creator && edge.has_creator) { %>

<%-renkan.translate("Created by:")%><%- shortenText(edge.created_by_title, 25) %>

<% } %>' + '

×<%-renkan.translate("Edit Edge")%>

' + + '

<%-renkan.translate("Title:")%>

' + + '<% if (options.show_edge_editor_uri) { %>

<%-renkan.translate("URI:")%>

' + + '<% if (options.properties.length) { %>

<%-renkan.translate("Choose from vocabulary:")%>

<% } } %>' + + '<% if (options.show_edge_editor_color) { %>

<%-renkan.translate("Edge color:")%>

' + + '<%= renkan.colorPicker %><%- renkan.translate("Choose color") %>

<% } %>' + + '<% if (options.show_edge_editor_direction) { %>

<%- renkan.translate("Change edge direction") %>

<% } %>' + + '<% if (options.show_edge_editor_nodes) { %>

<%-renkan.translate("From:")%><%- shortenText(edge.from_title, 25) %>

' + + '

<%-renkan.translate("To:")%><%- shortenText(edge.to_title, 25) %>

<% } %>' + + '<% if (options.show_edge_editor_creator && edge.has_creator) { %>

<%-renkan.translate("Created by:")%><%- shortenText(edge.created_by_title, 25) %>

<% } %>' ), readOnlyTemplate: _.template( - '

×<% if (options.show_edge_tooltip_color) { %><% } %>' - + '<% if (edge.uri) { %><% } %><%-edge.title%><% if (edge.uri) { %><% } %>

' - + '<% if (options.show_edge_tooltip_uri && edge.uri) { %>

<%-edge.short_uri%>

<% } %>' - + '

<%-edge.description%>

' - + '<% if (options.show_edge_tooltip_nodes) { %>

<%-renkan.translate("From:")%><%- shortenText(edge.from_title, 25) %>

' - + '

<%-renkan.translate("To:")%><%- shortenText(edge.to_title, 25) %>

<% } %>' - + '<% if (options.show_edge_tooltip_creator && edge.has_creator) { %>

<%-renkan.translate("Created by:")%><%- shortenText(edge.created_by_title, 25) %>

<% } %>' + '

×<% if (options.show_edge_tooltip_color) { %><% } %>' + + '<% if (edge.uri) { %><% } %><%-edge.title%><% if (edge.uri) { %><% } %>

' + + '<% if (options.show_edge_tooltip_uri && edge.uri) { %>

<%-edge.short_uri%>

<% } %>' + + '

<%-edge.description%>

' + + '<% if (options.show_edge_tooltip_nodes) { %>

<%-renkan.translate("From:")%><%- shortenText(edge.from_title, 25) %>

' + + '

<%-renkan.translate("To:")%><%- shortenText(edge.to_title, 25) %>

<% } %>' + + '<% if (options.show_edge_tooltip_creator && edge.has_creator) { %>

<%-renkan.translate("Created by:")%><%- shortenText(edge.created_by_title, 25) %>

<% } %>' ), draw: function() { var _model = this.source_representation.model, @@ -166,7 +166,7 @@ }); /* EdgeEditor End */ - + return EdgeEditor; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/edgeremovebutton.js --- a/client/js/renderer/edgeremovebutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/edgeremovebutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/basebutton'], function ($, _, requtils, BaseButton) { - + 'use strict'; + var Utils = requtils.getUtils(); /* EdgeRemoveButton Begin */ @@ -36,7 +36,7 @@ }); /* EdgeRemoveButton End */ - + return EdgeRemoveButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/edgerevertbutton.js --- a/client/js/renderer/edgerevertbutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/edgerevertbutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/basebutton'], function ($, _, requtils, BaseButton) { - + 'use strict'; + var Utils = requtils.getUtils(); /* EdgeRevertButton Begin */ @@ -24,7 +24,7 @@ }); /* EdgeRevertButton End */ - + return EdgeRevertButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/miniframe.js --- a/client/js/renderer/miniframe.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/miniframe.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/baserepresentation'], function ($, _, requtils, BaseRepresentation) { - + 'use strict'; + var Utils = requtils.getUtils(); /* MiniFrame Begin */ @@ -21,7 +21,7 @@ }); /* MiniFrame End */ - + return MiniFrame; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/nodebutton.js --- a/client/js/renderer/nodebutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/nodebutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,6 +1,6 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/basebutton'], function ($, _, requtils, BaseButton) { + 'use strict'; var Utils = requtils.getUtils(); @@ -31,7 +31,7 @@ }); /* _NodeButton End */ - + return _NodeButton; }); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/nodeeditbutton.js --- a/client/js/renderer/nodeeditbutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/nodeeditbutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/nodebutton'], function ($, _, requtils, NodeButton) { - + 'use strict'; + var Utils = requtils.getUtils(); /* NodeEditButton Begin */ @@ -26,7 +26,7 @@ }); /* NodeEditButton End */ - + return NodeEditButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/nodeeditor.js --- a/client/js/renderer/nodeeditor.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/nodeeditor.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/baseeditor'], function ($, _, requtils, BaseEditor) { - + 'use strict'; + var Utils = requtils.getUtils(); /* NodeEditor Begin */ @@ -10,26 +10,26 @@ _(NodeEditor.prototype).extend({ template: _.template( - '

×<%-renkan.translate("Edit Node")%>

' - + '

<%-renkan.translate("Title:")%>

' - + '<% if (options.show_node_editor_uri) { %>

<%-renkan.translate("URI:")%>

<% } %>' - + '<% if (options.show_node_editor_description) { %>

<%-renkan.translate("Description:")%><%-node.description%>

<% } %>' - + '<% if (options.show_node_editor_size) { %>

<%-renkan.translate("Size:")%>-<%-node.size%>+

<% } %>' - + '<% if (options.show_node_editor_color) { %>

<%-renkan.translate("Node color:")%>

' - + '<%= renkan.colorPicker %><%- renkan.translate("Choose color") %>

<% } %>' - + '<% if (options.show_node_editor_image) { %>

' - + '<% if (node.clip_path) { %><% }%>' - + '

<%-renkan.translate("Image URL:")%>

' - + '

<%-renkan.translate("Choose Image File:")%>

<% } %>' - + '<% if (options.show_node_editor_creator && node.has_creator) { %>

<%-renkan.translate("Created by:")%> <%- shortenText(node.created_by_title, 25) %>

<% } %>' + '

×<%-renkan.translate("Edit Node")%>

' + + '

<%-renkan.translate("Title:")%>

' + + '<% if (options.show_node_editor_uri) { %>

<%-renkan.translate("URI:")%>

<% } %>' + + '<% if (options.show_node_editor_description) { %>

<%-renkan.translate("Description:")%><%-node.description%>

<% } %>' + + '<% if (options.show_node_editor_size) { %>

<%-renkan.translate("Size:")%>-<%-node.size%>+

<% } %>' + + '<% if (options.show_node_editor_color) { %>

<%-renkan.translate("Node color:")%>

' + + '<%= renkan.colorPicker %><%- renkan.translate("Choose color") %>

<% } %>' + + '<% if (options.show_node_editor_image) { %>

' + + '<% if (node.clip_path) { %><% }%>' + + '

<%-renkan.translate("Image URL:")%>

' + + '

<%-renkan.translate("Choose Image File:")%>

<% } %>' + + '<% if (options.show_node_editor_creator && node.has_creator) { %>

<%-renkan.translate("Created by:")%> <%- shortenText(node.created_by_title, 25) %>

<% } %>' ), readOnlyTemplate: _.template( - '

×<% if (options.show_node_tooltip_color) { %><% } %>' - + '<% if (node.uri) { %><% } %><%-node.title%><% if (node.uri) { %><% } %>

' - + '<% if (node.uri && options.show_node_tooltip_uri) { %>

<%-node.short_uri%>

<% } %>' - + '<% if (options.show_node_tooltip_description) { %>

<%-node.description%>

<% } %>' - + '<% if (node.image && options.show_node_tooltip_image) { %>

<% } %>' - + '<% if (node.has_creator && options.show_node_tooltip_creator) { %>

<%-renkan.translate("Created by:")%><%- shortenText(node.created_by_title, 25) %>

<% } %>' + '

×<% if (options.show_node_tooltip_color) { %><% } %>' + + '<% if (node.uri) { %><% } %><%-node.title%><% if (node.uri) { %><% } %>

' + + '<% if (node.uri && options.show_node_tooltip_uri) { %>

<%-node.short_uri%>

<% } %>' + + '<% if (options.show_node_tooltip_description) { %>

<%-node.description%>

<% } %>' + + '<% if (node.image && options.show_node_tooltip_image) { %>

<% } %>' + + '<% if (node.has_creator && options.show_node_tooltip_creator) { %>

<%-renkan.translate("Created by:")%><%- shortenText(node.created_by_title, 25) %>

<% } %>' ), draw: function() { var _model = this.source_representation.model, @@ -196,14 +196,14 @@ }, redraw: function() { var _coords = this.source_representation.paper_coords; - Utils.drawEditBox(this.options, _coords, this.editor_block, this.source_representation.circle_radius * .75, this.editor_$); + Utils.drawEditBox(this.options, _coords, this.editor_block, this.source_representation.circle_radius * 0.75, this.editor_$); this.editor_$.show(); paper.view.draw(); } }); /* NodeEditor End */ - + return NodeEditor; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/nodeenlargebutton.js --- a/client/js/renderer/nodeenlargebutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/nodeenlargebutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,6 +1,7 @@ -"use strict"; + define(['jquery', 'underscore', 'requtils', 'renderer/nodebutton'], function ($, _, requtils, NodeButton) { + 'use strict'; var Utils = requtils.getUtils(); @@ -28,7 +29,7 @@ }); /* NodeEnlargeButton End */ - + return NodeEnlargeButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/nodelinkbutton.js --- a/client/js/renderer/nodelinkbutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/nodelinkbutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/nodebutton'], function ($, _, requtils, NodeButton) { - + 'use strict'; + var Utils = requtils.getUtils(); /* NodeLinkButton Begin */ @@ -33,7 +33,7 @@ }); /* NodeLinkButton End */ - + return NodeLinkButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/noderemovebutton.js --- a/client/js/renderer/noderemovebutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/noderemovebutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,6 +1,6 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/nodebutton'], function ($, _, requtils, NodeButton) { + 'use strict'; var Utils = requtils.getUtils(); @@ -40,7 +40,7 @@ }); /* NodeRemoveButton End */ - + return NodeRemoveButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/noderepr.js --- a/client/js/renderer/noderepr.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/noderepr.js Fri May 16 14:09:57 2014 +0200 @@ -1,8 +1,8 @@ -/* paper-renderer.js */ -"use strict"; + define(['jquery', 'underscore', 'requtils', 'renderer/baserepresentation'], function ($, _, requtils, BaseRepresentation) { - + 'use strict'; + var Utils = requtils.getUtils(); /* Rkns.Renderer.Node Class */ @@ -82,7 +82,7 @@ var opacity = 1; if (this.model.get("delete_scheduled")) { - opacity = .5; + opacity = 0.5; this.active_buttons = this.pending_delete_buttons; this.circle.dashArray = [2,2]; } else { @@ -103,12 +103,12 @@ } if (this.node_image) { - this.node_image.opacity = this.highlighted ? opacity * .5 : (opacity - .01); + this.node_image.opacity = this.highlighted ? opacity * 0.5 : (opacity - 0.01); } this.circle.fillColor = this.highlighted ? this.options.highlighted_node_fill_color : this.options.node_fill_color; - this.circle.opacity = this.options.show_node_circles ? opacity : .01; + this.circle.opacity = this.options.show_node_circles ? opacity : 0.01; var _text = this.model.get("title") || this.renkan.translate(this.options.label_untitled_nodes) || ""; _text = Utils.shortenText(_text, this.options.node_label_max_length); @@ -202,9 +202,9 @@ var res = parseFloat(v), isY = k % 2; if (isY) { - res = ( res - .5 ) * height; + res = ( res - 0.5 ) * height; } else { - res = ( res - .5 ) * width; + res = ( res - 0.5 ) * width; } if (relative) { res += lastCoords[isY]; @@ -268,7 +268,7 @@ _raster.locked = true; // Disable mouse events on icon if (hasClipPath) { _raster = new paper.Group(_clip, _raster); - _raster.opacity = .99; + _raster.opacity = 0.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). */ @@ -278,7 +278,7 @@ if (this.options.clip_node_images) { var _circleClip = new paper.Path.Circle(centerPoint, baseRadius); _raster = new paper.Group(_circleClip, _raster); - _raster.opacity = .99; + _raster.opacity = 0.99; _raster.clipped = true; _circleClip.__representation = this; } @@ -325,7 +325,7 @@ if (_uri) { $('.Rk-Bin-Item').each(function() { var _el = $(this); - if (_el.attr("data-uri") == _uri) { + if (_el.attr("data-uri") === _uri) { _el.addClass("selected"); } }); @@ -417,8 +417,7 @@ } } }); - + return NodeRepr; - + }); - diff -r f67047a16084 -r fba23fde14ba client/js/renderer/noderevertbutton.js --- a/client/js/renderer/noderevertbutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/noderevertbutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/nodebutton'], function ($, _, requtils, NodeButton) { - + 'use strict'; + var Utils = requtils.getUtils(); /* NodeRevertButton Begin */ @@ -28,7 +28,7 @@ }); /* NodeRevertButton End */ - + return NodeRevertButton; }); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/nodeshrinkbutton.js --- a/client/js/renderer/nodeshrinkbutton.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/nodeshrinkbutton.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,7 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/nodebutton'], function ($, _, requtils, NodeButton) { - + 'use strict'; + var Utils = requtils.getUtils(); /* NodeShrinkButton Begin */ @@ -28,7 +28,7 @@ }); /* NodeShrinkButton End */ - + return NodeShrinkButton; -}); \ No newline at end of file +}); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/scene.js --- a/client/js/renderer/scene.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/scene.js Fri May 16 14:09:57 2014 +0200 @@ -1,9 +1,9 @@ -"use strict"; define(['jquery', 'underscore', 'requtils', 'renderer/miniframe'], function ($, _, requtils, MiniFrame) { - + 'use strict'; + var Utils = requtils.getUtils(); - + /* Scene Begin */ var Scene = function(_renkan) { @@ -28,7 +28,7 @@ this.node_layer = new paper.Layer(); this.buttons_layer = new paper.Layer(); this.delete_list = []; - + if (_renkan.options.show_minimap) { this.minimap = { background_layer: new paper.Layer(), @@ -45,7 +45,7 @@ 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.scale = 0.1; this.minimap.node_layer.activate(); this.minimap.cliprectangle = new paper.Path.Rectangle(this.minimap.topleft, this.minimap.size); @@ -54,7 +54,7 @@ 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.opacity = 0.3; this.minimap.miniframe.strokeColor = '#000080'; this.minimap.miniframe.strokeWidth = 3; this.minimap.miniframe.__representation = new MiniFrame(this, null); @@ -82,7 +82,7 @@ img.src = _renkan.options.static_url + 'img/' + imgname + '.png'; _this.icon_cache[imgname] = img; }); - + var throttledMouseMove = _.throttle(function(_event, _isTouch) { _this.onMouseMove(_event, _isTouch); }, Utils._MOUSEMOVE_RATE); @@ -112,9 +112,9 @@ _event.preventDefault(); var _touches = _event.originalEvent.touches[0]; if ( - _renkan.options.allow_double_click - && new Date() - _lastTap < Utils._DOUBLETAP_DELAY - && ( Math.pow(_lastTapX - _touches.pageX, 2) + Math.pow(_lastTapY - _touches.pageY, 2) < Utils._DOUBLETAP_DISTANCE ) + _renkan.options.allow_double_click && + new Date() - _lastTap < Utils._DOUBLETAP_DELAY && + ( Math.pow(_lastTapX - _touches.pageX, 2) + Math.pow(_lastTapY - _touches.pageY, 2) < Utils._DOUBLETAP_DISTANCE ) ) { _lastTap = 0; _this.onDoubleClick(_touches); @@ -130,7 +130,7 @@ touchmove: function(_event) { _event.preventDefault(); _lastTap = 0; - if (_event.originalEvent.touches.length == 1) { + if (_event.originalEvent.touches.length === 1) { _this.onMouseMove(_event.originalEvent.touches[0], true); } else { if (!_zooming) { @@ -147,7 +147,7 @@ _newOffset = new paper.Point([ _this.canvas_$.width(), _this.canvas_$.height() - ]).multiply( .5 * ( 1 - _scaleRatio ) ).add(_this.offset.multiply( _scaleRatio )); + ]).multiply( 0.5 * ( 1 - _scaleRatio ) ).add(_this.offset.multiply( _scaleRatio )); _this.setScale(_newScale, _newOffset); } }, @@ -256,15 +256,16 @@ bindClick(".Rk-Save-Button", "save"); bindClick(".Rk-Open-Button", "open"); this.$.find(".Rk-Bookmarklet-Button") - .attr("href","javascript:" + Utils._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; - }); + /*jshint scripturl:true */ + .attr("href","javascript:" + Utils._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() { $(this).find(".Rk-TopBar-Tooltip").show(); }).mouseout(function() { @@ -338,8 +339,8 @@ if (_renkan.options.size_bug_fix) { var _delay = ( - typeof _renkan.options.size_bug_fix === "number" - ? _renkan.options.size_bug_fix + typeof _renkan.options.size_bug_fix === "number" ? + _renkan.options.size_bug_fix : 500 ); window.setTimeout( @@ -404,7 +405,7 @@ if (rxs.test(n.get("title")) || rxs.test(n.get("description"))) { _this.getRepresentationByModel(n).highlight(rxs); } else { - _this.getRepresentationByModel(n).unhighlight(); + _this.getRepresentationByModel(n).unhighlight(); } }); } @@ -442,31 +443,31 @@ _(Scene.prototype).extend({ template: _.template( - '<% if (options.show_top_bar) { %>

<% if (!options.editor_mode) { %>

<%- project.get("title") || translate("Untitled project")%>

' - + '<% } else { %>" placeholder="<%-translate("Untitled project")%>" /><% } %>' - + '<% if (options.show_user_list) { %>

<% if (options.user_color_editable) { %><% } %>' - + '<% if (options.user_color_editable) { print(colorPicker) } %>

<% } %>' - + '<% if (options.home_button_url) {%><% } %>' - + '<% if (options.show_fullscreen_button) { %><% } %>' - + '<% if (options.editor_mode) { %>' - + '<% if (options.show_addnode_button) { %><% } %>' - + '<% if (options.show_addedge_button) { %><% } %>' - + '<% if (options.show_save_button) { %><% } %>' - + '<% if (options.show_open_button) { %><% } %>' - + '<% if (options.show_bookmarklet) { %><% } %>' - + '<% }; if (options.show_search_field) { %>' - + '<% } %>

<% } %>' - + '

' - + '

' - + '<% if (options.show_bins) { %>

<% } %>' - + '

' - + '<% if (options.editor_mode) { %>

<% } %>' - + '<% if (options.editor_mode || !isNaN(parseInt(options.default_view))) { %>

<% } %>

' - + '

' + '<% if (options.show_top_bar) { %>

<% if (!options.editor_mode) { %>

<%- project.get("title") || translate("Untitled project")%>

' + + '<% } else { %>" placeholder="<%-translate("Untitled project")%>" /><% } %>' + + '<% if (options.show_user_list) { %>

<% if (options.user_color_editable) { %><% } %>' + + '<% if (options.user_color_editable) { print(colorPicker) } %>

<% } %>' + + '<% if (options.home_button_url) {%><% } %>' + + '<% if (options.show_fullscreen_button) { %><% } %>' + + '<% if (options.editor_mode) { %>' + + '<% if (options.show_addnode_button) { %><% } %>' + + '<% if (options.show_addedge_button) { %><% } %>' + + '<% if (options.show_save_button) { %><% } %>' + + '<% if (options.show_open_button) { %><% } %>' + + '<% if (options.show_bookmarklet) { %><% } %>' + + '<% }; if (options.show_search_field) { %>' + + '<% } %>

<% } %>' + + '

' + + '

' + + '<% if (options.show_bins) { %>

<% } %>' + + '

' + + '<% if (options.editor_mode) { %>

<% } %>' + + '<% if (options.editor_mode || !isNaN(parseInt(options.default_view))) { %>

<% } %>

' + + '

' ), fixSize: function(_autoscale) { var w = this.$.width(), @@ -508,7 +509,7 @@ _endYIn = Math.sin(_endRads) * _inR - _padding * _enddy, _endXOut = Math.cos(_endRads) * _outR - _padding * _enddx, _endYOut = Math.sin(_endRads) * _outR - _padding * _enddy, - _centerR = (_inR + _outR)/2, + _centerR = (_inR + _outR) / 2, _centerRads = (_startRads + _endRads) / 2, _centerX = Math.cos(_centerRads) * _centerR, _centerY = Math.sin(_centerRads) * _centerR, @@ -525,7 +526,7 @@ _path.lineTo([_endXOut, _endYOut]); _path.arcTo([_centerXOut, _centerYOut], [_startXOut, _startYOut]); _path.fillColor = _options.buttons_background; - _path.opacity = .5; + _path.opacity = 0.5; _path.closed = true; _path.__representation = _repr; var _text = new paper.PointText(_textX,_textY); @@ -568,11 +569,11 @@ _grp.position = _restPos; }, select: function() { - _path.opacity = .8; + _path.opacity = 0.8; _text.visible = true; }, unselect: function() { - _path.opacity = .5; + _path.opacity = 0.5; _text.visible = false; }, destroy: function() { @@ -595,9 +596,9 @@ }, addToBundles: function(_edgeRepr) { var _bundle = _(this.bundles).find(function(_bundle) { - return ( - ( _bundle.from === _edgeRepr.from_representation && _bundle.to === _edgeRepr.to_representation ) - || ( _bundle.from === _edgeRepr.to_representation && _bundle.to === _edgeRepr.from_representation ) + return ( + ( _bundle.from === _edgeRepr.from_representation && _bundle.to === _edgeRepr.to_representation ) || + ( _bundle.from === _edgeRepr.to_representation && _bundle.to === _edgeRepr.from_representation ) ); }); if (typeof _bundle !== "undefined") { @@ -683,8 +684,8 @@ _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.scale * 0.8 * this.renkan.options.minimap_width / paper.view.bounds.width, + this.scale * 0.8 * this.renkan.options.minimap_height / paper.view.bounds.height, ( this.renkan.options.minimap_width - 2 * this.renkan.options.minimap_padding ) / (_maxx - _minx), ( this.renkan.options.minimap_height - 2 * this.renkan.options.minimap_padding ) / (_maxy - _miny) ); @@ -692,7 +693,7 @@ this.minimap.scale = _scale; } if (nodes.length === 1) { - this.minimap.scale = .1; + this.minimap.scale = 0.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(); @@ -707,8 +708,8 @@ return _point.subtract(this.offset).divide(this.scale); }, addRepresentation: function(_type, _model) { - var r = requtils.getRenderer()[_type]; - var _repr = new r(this, _model); + var RendererType = requtils.getRenderer()[_type]; + var _repr = new RendererType(this, _model); this.representations.push(_repr); return _repr; }, @@ -781,7 +782,7 @@ _representation.destroy(); this.representations = _(this.representations).reject( function(_repr) { - return _repr == _representation; + return _repr === _representation; } ); }, @@ -795,7 +796,7 @@ }, removeRepresentationsOfType: function(_type) { var _representations = _(this.representations).filter(function(_repr) { - return _repr.type == _type; + return _repr.type === _type; }), _this = this; _(_representations).each(function(_repr) { @@ -990,22 +991,22 @@ }, defaultDropHandler: function(_data) { var newNode = {}; + var snippet = ""; switch(_data["text/x-iri-specific-site"]) { case "twitter": - var snippet = $('

').html(_data["text/x-iri-selected-html"]), - tweetdiv = snippet.find(".tweet"); + snippet = $('

').html(_data["text/x-iri-selected-html"]); + var tweetdiv = snippet.find(".tweet"); newNode.title = this.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 = $('

').html(_data["text/x-iri-selected-html"]); + snippet = $('

').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"]; @@ -1015,7 +1016,7 @@ 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 = $('

').html(_data["text/html"] || _data["text/x-iri-selected-html"]); + snippet = $('

').html(_data["text/html"] || _data["text/x-iri-selected-html"]); var _svgimgs = snippet.find("image"); if (_svgimgs.length) { newNode.image = _svgimgs.attr("xlink:href"); @@ -1048,7 +1049,7 @@ newNode.title = _data["text/x-iri-source-title"]; } if (_data["text/html"] || _data["text/x-iri-selected-html"]) { - var snippet = $('

').html(_data["text/html"] || _data["text/x-iri-selected-html"]); + snippet = $('

').html(_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; @@ -1069,11 +1070,11 @@ newNode[f] = undefined; } } - + if(typeof this.renkan.options.drop_enhancer === "function"){ newNode = this.renkan.options.drop_enhancer(newNode, _data); } - + return newNode; }, @@ -1088,9 +1089,9 @@ } catch(e) {} } - + var newNode = (typeof this.renkan.options.drop_handler === "undefined")?this.defaultDropHandler(_data):this.renkan.options.drop_handler(_data); - + var _off = this.canvas_$.offset(), _point = new paper.Point([ _event.pageX - _off.left, @@ -1119,18 +1120,19 @@ }, fullScreen: function() { var _isFull = document.fullScreen || document.mozFullScreen || document.webkitIsFullScreen, - _el = this.renkan.$[0], - _requestMethods = ["requestFullScreen","mozRequestFullScreen","webkitRequestFullScreen"], - _cancelMethods = ["cancelFullScreen","mozCancelFullScreen","webkitCancelFullScreen"]; + _el = this.renkan.$[0], + _requestMethods = ["requestFullScreen","mozRequestFullScreen","webkitRequestFullScreen"], + _cancelMethods = ["cancelFullScreen","mozCancelFullScreen","webkitCancelFullScreen"], + i; if (_isFull) { - for (var i = 0; i < _cancelMethods.length; i++) { + for (i = 0; i < _cancelMethods.length; i++) { if (typeof document[_cancelMethods[i]] === "function") { document[_cancelMethods[i]](); break; } } } else { - for (var i = 0; i < _requestMethods.length; i++) { + for (i = 0; i < _requestMethods.length; i++) { if (typeof _el[_requestMethods[i]] === "function") { _el[_requestMethods[i]](); break; @@ -1143,7 +1145,7 @@ _offset = new paper.Point([ this.canvas_$.width(), this.canvas_$.height() - ]).multiply( .5 * ( 1 - Math.SQRT1_2 ) ).add(this.offset.multiply( Math.SQRT1_2 )); + ]).multiply( 0.5 * ( 1 - Math.SQRT1_2 ) ).add(this.offset.multiply( Math.SQRT1_2 )); this.setScale( _newScale, _offset ); }, zoomIn: function() { @@ -1151,7 +1153,7 @@ _offset = new paper.Point([ this.canvas_$.width(), this.canvas_$.height() - ]).multiply( .5 * ( 1 - Math.SQRT2 ) ).add(this.offset.multiply( Math.SQRT2 )); + ]).multiply( 0.5 * ( 1 - Math.SQRT2 ) ).add(this.offset.multiply( Math.SQRT2 )); this.setScale( _newScale, _offset ); }, addNodeBtn: function() { @@ -1177,9 +1179,9 @@ foldBins: function() { var foldBinsButton = this.$.find(".Rk-Fold-Bins"), bins = this.renkan.$.find(".Rk-Bins"); + var _this = this; if (bins.offset().left < 0) { bins.animate({left: 0},250); - var _this = this; this.$.animate({left: 300},250,function() { var w = _this.$.width(); paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); @@ -1187,7 +1189,6 @@ foldBinsButton.html("«"); } else { bins.animate({left: -300},250); - var _this = this; this.$.animate({left: 0},250,function() { var w = _this.$.width(); paper.view.viewSize = new paper.Size([w, _this.canvas_$.height()]); @@ -1198,9 +1199,9 @@ save: function() { }, open: function() { } }); - + /* Scene End */ - + return Scene; - + }); diff -r f67047a16084 -r fba23fde14ba client/js/renderer/tempedge.js --- a/client/js/renderer/tempedge.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/renderer/tempedge.js Fri May 16 14:09:57 2014 +0200 @@ -1,7 +1,8 @@ -"use strict"; + define(['jquery', 'underscore', 'requtils', 'renderer/baserepresentation'], function ($, _, requtils, BaseRepresentation) { - + 'use strict'; + var Utils = requtils.getUtils(); /* TempEdge Class Begin */ @@ -93,7 +94,7 @@ }); /* TempEdge Class End */ - + return TempEdge; -}) +}); diff -r f67047a16084 -r fba23fde14ba client/js/require-utils.js --- a/client/js/require-utils.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/require-utils.js Fri May 16 14:09:57 2014 +0200 @@ -1,5 +1,5 @@ -"use strict"; define([], function ($, _) { + 'use strict'; return { getUtils: function(){ return window.Rkns.Utils; @@ -8,5 +8,5 @@ return window.Rkns.Renderer; } }; - -}); \ No newline at end of file + +}); diff -r f67047a16084 -r fba23fde14ba client/js/retrieve-kc.js --- a/client/js/retrieve-kc.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/retrieve-kc.js Fri May 16 14:09:57 2014 +0200 @@ -2,7 +2,7 @@ Rkns.retrieveKC = function(_renkan, _opts) { if (typeof _opts === "undefined") { - var _opts = {}; + _opts = {}; } var _proj = _renkan.project, _username = _opts.user_name || "Yves-Marie", diff -r f67047a16084 -r fba23fde14ba client/js/save-once.js --- a/client/js/save-once.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/save-once.js Fri May 16 14:09:57 2014 +0200 @@ -6,7 +6,7 @@ _onLeave = function() { return "Project not saved"; }; - if (typeof _opts.http_method == "undefined") { + if (typeof _opts.http_method === "undefined") { _opts.http_method = 'POST'; } var _load = function() { @@ -71,5 +71,5 @@ } else { _save(); } - } + }; }; diff -r f67047a16084 -r fba23fde14ba client/js/space-editor.js --- a/client/js/space-editor.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/space-editor.js Fri May 16 14:09:57 2014 +0200 @@ -1,10 +1,10 @@ $(function() { - + var originalData = { show_editor: false, container: "preview" }; - + var userData = { bins: [ { @@ -27,27 +27,27 @@ } ] }; - + function getNormalizedHtml(jqsel) { return jqsel.html().replace(/[\r\n]/gm,' ').replace(/\s{2,}/g,' ').replace(/(^\s+|\s+$)/g,''); } - + var searchEngineTemplate = getNormalizedHtml($(".search-engine-list")); - + $(".search-engine-list").empty().sortable(); - + var resourceTemplate = getNormalizedHtml($(".resource-list")); - + $(".resource-list").empty(); - + var binTemplate = getNormalizedHtml($(".bin-list")); - + $(".bin-list").empty().sortable(); - + function addSearchEngine(data, editMode) { - + $(".item").removeClass("item-editing"); - + var element = $(searchEngineTemplate), allfields = element.find(".edit-value"), typefield = element.find(".search-engine-type .edit-value"), @@ -56,16 +56,16 @@ langfield = element.find(".search-engine-language .edit-value"), langdisplay = element.find(".search-engine-language .display-value"); element.data("userdata",data); - + if (editMode) { element.addClass("item-editing"); } - + var onChange = function() { - + data.type = typefield.val(); typedisplay.text(typefield.find("[value=" + data.type + "]").text()); - + if (data.type === "Wikipedia") { data.lang = langfield.val() || "en"; langdisplay.text(langfield.find("[value=" + data.lang + "]").text()); @@ -74,18 +74,18 @@ delete data.lang; langsection.hide(); } - } - + }; + typefield.val(data.type); - + if (data.type === "Wikipedia") { langfield.val(data.lang || "en"); } - + allfields.on("keyup paste change", onChange); - + onChange(); - + element.click(function() { $(".item").removeClass("item-editing"); element.addClass("item-editing"); @@ -95,14 +95,14 @@ element.remove(); return false; }); - + $(".search-engine-list").append(element); } - + function addBin(data, editMode) { - + $(".item").removeClass("item-editing"); - + var element = $(binTemplate), allfields = element.find(".edit-value"), typefield = element.find(".bin-type .edit-value"), @@ -125,22 +125,22 @@ titlefield = element.find(".bin-title .edit-value"), titledisplay = element.find(".bin-title .display-value"), reslist = element.find(".resource-list"); - + reslist.sortable({ stop: updateListData }); - + element.data("userdata",data); - + if (editMode) { element.addClass("item-editing"); } - + var onChange = function() { - + data.type = typefield.val(); typedisplay.text(typefield.find("[value=" + data.type + "]").text()); - + if (data.type === "Wikipedia") { data.lang = langfield.val() || "en"; langdisplay.text(langfield.find("[value=" + data.lang + "]").text()); @@ -149,15 +149,15 @@ delete data.lang; langsection.hide(); } - + if (data.type === "Ldt") { ldtsection.show(); data.ldt_type = ldttypefield.val() || "Results"; ldttypedisplay.text(ldttypefield.find("[value=" + data.ldt_type + "]").text()); - + data.ldt_platform = ldtpffield.val() || ldtpffield.val("http://ldt.iri.centrepompidou.fr/").val(); ldtpfdisplay.text(data.ldt_platform); - + if (data.ldt_type === "Project") { data.project_id = ldtprojfield.val(); ldtprojdisplay.text(data.ldt_project); @@ -166,14 +166,14 @@ delete data.ldt_project; ldtprojsection.hide(); } - + } else { delete data.ldt_type; delete data.project_id; delete data.ldt_platform; ldtsection.hide(); } - + if (data.type === "Wikipedia" || (data.type === "Ldt" && data.ldt_type === "Results")) { data.search = kwfield.val(); kwdisplay.text(data.search); @@ -182,7 +182,7 @@ delete data.search; kwsection.hide(); } - + if (data.type === "ResourceList") { data.title = titlefield.val() || titlefield.val("Untitled Resource List").val(); titledisplay.text(data.title); @@ -190,11 +190,11 @@ } else { ressection.hide(); } - + updateListData(); - - } - + + }; + var updateListData = function() { if (data.type === "ResourceList") { data.list = Array.prototype.slice.call( @@ -203,10 +203,10 @@ } else { delete data.list; } - } - + }; + var addResource = function(resdata, editmode) { - + var resel = $(resourceTemplate), all_fields = resel.find(".edit-value"), title_field = resel.find(".resource-title .edit-value"), @@ -217,87 +217,87 @@ description_text = resel.find(".resource-description .display-value"), image_field = resel.find(".resource-image .edit-value"), image_text = resel.find(".resource-image .display-value"); - + resel.data("userdata",resdata); - + if (editmode) { resel.addClass("resource-editing"); } - + var onResourceChange = function() { - + resdata.title = title_field.val(); title_text.text(resdata.title); - + resdata.description = description_field.val(); description_text.text(resdata.description); - + resdata.url = url_field.val(); url_text.text(resdata.url); - + resdata.image = image_field.val(); image_text.text(resdata.image); - + updateListData(); - - } - + + }; + title_field.val( resdata.title || "" ); url_field.val( resdata.url || "" ); description_field.val( resdata.description || "" ); image_field.val( resdata.image || "" ); - + all_fields.on("keyup paste change", onResourceChange); - + onResourceChange(); - + resel.find(".remove-item").click(function() { resel.remove(); updateListData(); return false; }); - + resel.click(function() { $(".resource").removeClass("resource-editing"); resel.addClass("resource-editing"); return false; }); - + reslist.append(resel); - } - + }; + if (data.list) { data.list.forEach(addResource); } - + typefield.val(data.type); - + if (data.type === "Wikipedia") { langfield.val(data.lang || "en"); } - + if (data.type === "Ldt") { ldttypefield.val(data.ldt_type || "Results"); ldtpffield.val(data.ldt_platform || "http://ldt.iri.centrepompidou.fr/"); - + if (data.ldt_type === "Project") { ldtprojfield.val(data.ldt_project); } - + } - + if (data.type === "Wikipedia" || (data.type === "Ldt" && data.ldt_type === "Results")) { kwfield.val(data.search || ""); } - + if (data.type === "ResourceList") { titlefield.val(data.title || "Untitled Resource List"); } - + allfields.on("keyup paste change", onChange); - + onChange(); - + element.click(function() { $(".item").removeClass("item-editing"); element.addClass("item-editing"); @@ -311,19 +311,19 @@ addResource({"title": "New Resource"},true); return false; }); - + $(".bin-list").append(element); - + } - - + + userData.search.forEach(function(data) { addSearchEngine(data,false); }); userData.bins.forEach(function(data) { addBin(data,false); }); - + $(".add-search-engine").click(function() { addSearchEngine({ type: "Wikipedia", @@ -331,7 +331,7 @@ }, true); return false; }); - + $(".add-bin").click(function() { addBin({ type: "Wikipedia", @@ -340,7 +340,7 @@ }, true); return false; }); - + $(".update-preview").click(function() { userData.search = Array.prototype.slice.call( $(".search-engine").map(function(){return $(this).data("userdata");}) @@ -349,9 +349,9 @@ $(".bin").map(function(){return $(this).data("userdata");}) ); new Rkns.Renkan(_.extend({}, originalData, userData)); - + }); - + new Rkns.Renkan(_.extend({}, originalData, userData)); - + }); diff -r f67047a16084 -r fba23fde14ba client/js/wikipedia-bin.js --- a/client/js/wikipedia-bin.js Fri May 16 12:37:51 2014 +0200 +++ b/client/js/wikipedia-bin.js Fri May 16 14:09:57 2014 +0200 @@ -35,10 +35,10 @@ Rkns.Wikipedia.Bin = Rkns.Utils.inherit(Rkns._BaseBin); Rkns.Wikipedia.Bin.prototype.resultTemplate = Rkns._.template( - '

' - + '

<%=htitle%>

' - + '

<%=hdescription%>

' + '

' + + '

<%=htitle%>

' + + '

<%=hdescription%>

' ); Rkns.Wikipedia.Bin.prototype._init = function(_renkan, _opts) { @@ -89,7 +89,7 @@ } this.renkan.resizeBins(); }; - + Rkns.Wikipedia.Bin.prototype.refresh = function() { var _this = this; Rkns.$.ajax({ @@ -100,4 +100,4 @@ _this.render(); } }); -}; \ No newline at end of file +};

×<%-renkan.translate("Edit Edge")%>

×<% if (options.show_edge_tooltip_color) { %><% } %>' - + '<% if (edge.uri) { %><% } %><%-edge.title%><% if (edge.uri) { %><% } %>

×<% if (options.show_edge_tooltip_color) { %><% } %>' + + '<% if (edge.uri) { %><% } %><%-edge.title%><% if (edge.uri) { %><% } %>

×<%-renkan.translate("Edit Node")%>

×<%-renkan.translate("Edit Node")%>

×<% if (options.show_node_tooltip_color) { %><% } %>' - + '<% if (node.uri) { %><% } %><%-node.title%><% if (node.uri) { %><% } %>

×<% if (options.show_node_tooltip_color) { %><% } %>' + + '<% if (node.uri) { %><% } %><%-node.title%><% if (node.uri) { %><% } %>

<%- project.get("title") || translate("Untitled project")%>

<%- project.get("title") || translate("Untitled project")%>

<%=htitle%>

<%=htitle%>

<%=htitle%>

<%=htitle%>

<%=htitle%>

<%=htitle%>

Tags

<%=htitle%>

<%=htitle%>

' - + '<% if (url) { %><% } %><%=htitle%><% if (url) { %><% } %>

' + + '<% if (url) { %><% } %><%=htitle%><% if (url) { %><% } %>

' + _renkan.translate("Loading, please wait") + '

<%- translate("Select contents:")%>

<%- translate("Select contents:")%>

×<%-renkan.translate("Edit Edge")%>