# HG changeset patch # User rougeronj # Date 1430901481 -7200 # Node ID e246651b662664ae8c03efd2c8e0d4e444c7ab68 # Parent ce8dccd4321e4533774920519bb8369245777c70 replace tabs by spaces diff -r ce8dccd4321e -r e246651b6626 client/js/defaults.js --- a/client/js/defaults.js Tue May 05 18:00:13 2015 +0200 +++ b/client/js/defaults.js Wed May 06 10:38:01 2015 +0200 @@ -11,9 +11,9 @@ static_url: "", /* URL for static resources */ popup_editor: true, - /* show the node editor as a popup inside the renkan view */ + /* show the node editor as a popup inside the renkan view */ editor_panel: 'editor-panel', - /* GUI continer DOM element ID of the editor panel */ + /* GUI continer DOM element ID of the editor panel */ show_bins: true, /* Show bins in left column */ properties: [], diff -r ce8dccd4321e -r e246651b6626 client/js/main.js --- a/client/js/main.js Tue May 05 18:00:13 2015 +0200 +++ b/client/js/main.js Wed May 06 10:38:01 2015 +0200 @@ -111,12 +111,12 @@ this.project = new Rkns.Models.Project(); this.setCurrentUser = function (user_id, user_name) { - this.project.addUser({ - _id:user_id, - title: user_name - }); - this.current_user = user_id; - this.renderer.redrawUsers(); + this.project.addUser({ + _id:user_id, + title: user_name + }); + this.current_user = user_id; + this.renderer.redrawUsers(); }; if (typeof this.options.user_id !== "undefined") { @@ -307,7 +307,7 @@ this.$.find(".Rk-Search-Current").attr("class","Rk-Search-Current " + this.search_engine.getBgClass()); var listClasses = this.search_engine.getBgClass().split(" "); var classes = ""; - for (var i= 0; i < listClasses.length; i++) { + for (var i= 0; i < listClasses.length; i++) { classes += "." + listClasses[i]; } this.$.find(".Rk-Web-Search-Input.Rk-Search-Input").attr("placeholder", this.translate("Search in ") + this.$.find(".Rk-Search-List "+ classes).html()); diff -r ce8dccd4321e -r e246651b6626 client/js/renderer/edgeeditor.js --- a/client/js/renderer/edgeeditor.js Tue May 05 18:00:13 2015 +0200 +++ b/client/js/renderer/edgeeditor.js Wed May 06 10:38:01 2015 +0200 @@ -138,10 +138,10 @@ } }, redraw: function() { - if (this.options.popup_editor){ - var _coords = this.source_representation.paper_coords; - Utils.drawEditBox(this.options, _coords, this.editor_block, 5, this.editor_$); - } + if (this.options.popup_editor){ + var _coords = this.source_representation.paper_coords; + Utils.drawEditBox(this.options, _coords, this.editor_block, 5, this.editor_$); + } this.editor_$.show(); paper.view.draw(); } diff -r ce8dccd4321e -r e246651b6626 client/js/renderer/nodeeditor.js --- a/client/js/renderer/nodeeditor.js Tue May 05 18:00:13 2015 +0200 +++ b/client/js/renderer/nodeeditor.js Wed May 06 10:38:01 2015 +0200 @@ -202,10 +202,10 @@ }); }, redraw: function() { - if (this.options.popup_editor){ - var _coords = this.source_representation.paper_coords; - Utils.drawEditBox(this.options, _coords, this.editor_block, this.source_representation.circle_radius * 0.75, this.editor_$); - } + if (this.options.popup_editor){ + var _coords = this.source_representation.paper_coords; + Utils.drawEditBox(this.options, _coords, this.editor_block, this.source_representation.circle_radius * 0.75, this.editor_$); + } this.editor_$.show(); paper.view.draw(); } diff -r ce8dccd4321e -r e246651b6626 client/js/renderer/scene.js --- a/client/js/renderer/scene.js Tue May 05 18:00:13 2015 +0200 +++ b/client/js/renderer/scene.js Wed May 06 10:38:01 2015 +0200 @@ -15,9 +15,9 @@ this.canvas_$ = this.$.find(".Rk-Canvas"); this.labels_$ = this.$.find(".Rk-Labels"); if (!_renkan.options.popup_editor){ - this.editor_$ = $("#" + _renkan.options.editor_panel); - }else{ - this.editor_$ = this.$.find(".Rk-Editor"); + this.editor_$ = $("#" + _renkan.options.editor_panel); + }else{ + this.editor_$ = this.$.find(".Rk-Editor"); } this.notif_$ = this.$.find(".Rk-Notifications"); paper.setup(this.canvas_$[0]); diff -r ce8dccd4321e -r e246651b6626 client/js/save-once.js --- a/client/js/save-once.js Tue May 05 18:00:13 2015 +0200 +++ b/client/js/save-once.js Wed May 06 10:38:01 2015 +0200 @@ -20,13 +20,13 @@ url: _opts.url, data: getdata, beforeSend: function(){ - _proj.set({loading_status:true}); + _proj.set({loading_status:true}); }, success: function(_data) { _proj.set(_data, {validate: true}); - _proj.set({loading_status:false}); + _proj.set({loading_status:false}); _proj.set({save_status:0}); - _renkan.renderer.autoScale(); + _renkan.renderer.autoScale(); } }); }; @@ -39,7 +39,7 @@ contentType: "application/json", data: JSON.stringify(_data), beforeSend: function(){ - _proj.set({save_status:2}); + _proj.set({save_status:2}); }, success: function(data, textStatus, jqXHR) { $(window).off("beforeunload", _onLeave); @@ -51,8 +51,8 @@ }); }; var _checkLeave = function() { - _proj.set({save_status:1}); - + _proj.set({save_status:1}); + var title = _proj.get("title"); if (title && _proj.get("nodes").length) { $(".Rk-Save-Button").removeClass("disabled"); @@ -69,14 +69,14 @@ }; _load(); _proj.on("add:nodes add:edges add:users change", function(_model) { - _model.on("change remove", function(_model) { - if(!(_model.changedAttributes.length === 1 && _model.hasChanged('save_status'))) { - _checkLeave(); - } - }); - if(!(_proj.changedAttributes.length === 1 && _proj.hasChanged('save_status'))) { - _checkLeave(); - } + _model.on("change remove", function(_model) { + if(!(_model.changedAttributes.length === 1 && _model.hasChanged('save_status'))) { + _checkLeave(); + } + }); + if(!(_proj.changedAttributes.length === 1 && _proj.hasChanged('save_status'))) { + _checkLeave(); + } }); _renkan.renderer.save = function() { if ($(".Rk-Save-Button").hasClass("disabled")) {