ds_mooc_demo: comparison web/js/renkan.js

Mercurial Mercurial > ds_mooc_demo / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

web/js/renkan.js

changeset 39	ab880baf9486
parent 24	701af897de95

equal deleted inserted replaced

-:c28831a74f93
+:ab880baf9486
 /*
-_____            _
+*    _____            _
-|  __ \          | |
+*   |  __ \          | |
-| |__) |___ _ __ | | ____ _ _ __
+*   | |__) |___ _ __ | | ____ _ _ __
-|  _  // _ \ '_ \| |/ / _` | '_ \
+*   |  _  // _ \ '_ \| |/ / _` | '_ \
-| | \ \  __/ | | |   < (_| | | | |
+*   | | \ \  __/ | | |   < (_| | | | |
-|_|  \_\___|_| |_|_|\_\__,_|_| |_|
+*   |_|  \_\___|_| |_|_|\_\__,_|_| |_|
+*
 *  Copyright 2012-2013 Institut de recherche et d'innovation
 *  contributor(s) : Yves-Marie Haussonne, Raphael Velt, Samuel Huron
 *
 *  contact@iri.centrepompidou.fr
 *  http://www.iri.centrepompidou.fr
 var Rkns = root.Rkns;
 var $ = Rkns.$ = root.jQuery;
 var _ = Rkns._ = root._;
-Rkns.VERSION = '0.2.1';
+Rkns.VERSION = '0.2.3';
 Rkns.pickerColors = ["#8f1919", "#a80000", "#d82626", "#ff0000", "#e87c7c", "#ff6565", "#f7d3d3", "#fecccc",
 "#8f5419", "#a85400", "#d87f26", "#ff7f00", "#e8b27c", "#ffb265", "#f7e5d3", "#fee5cc",
 "#8f8f19", "#a8a800", "#d8d826", "#feff00", "#e8e87c", "#feff65", "#f7f7d3", "#fefecc",
 "#198f19", "#00a800", "#26d826", "#00ff00", "#7ce87c", "#65ff65", "#d3f7d3", "#ccfecc",
 return {
 _id: this.get("_id"),
 title: this.get("title"),
 uri: this.get("uri"),
 description: this.get("description"),
-color: this.get("color"),
+color: this.get("color")
 };
-},
+}
 });
 // NODE
 var Node = Models.Node = RenkanModel.extend({
 type: "node",
 color: this.get("color"),
 created_by: this.get("created_by") ? this.get("created_by").get("_id") : null,
 size: this.get("size"),
 "clip-path": this.get("clip-path")
 };
-},
+}
 });
 // EDGE
 var Edge = Models.Edge = RenkanModel.extend({
 type: "edge",
 },
 {
 type: Backbone.HasOne,
 key: "to",
 relatedModel: Node
-},
+}
 ],
 prepare: function(options) {
 var project = options.project;
 this.addReference(options, "created_by", project.get("users"), options.created_by, project.current_user);
 this.addReference(options, "from", project.get("nodes"), options.from);
 from: this.get("from") ? this.get("from").get("_id") : null,
 to: this.get("to") ? this.get("to").get("_id") : null,
 color: this.get("color"),
 created_by: this.get("created_by") ? this.get("created_by").get("_id") : null
 };
-},
+}
 });
 // PROJECT
 var Project = Models.Project = RenkanModel.extend({
 type: "project",
 key: "users",
 relatedModel: User,
 reverseRelation: {
 key: 'project',
 includeInJSON: '_id'
-},
+}
 },
 {
 type: Backbone.HasMany,
 key: "nodes",
 relatedModel: Node,
 reverseRelation: {
 key: 'project',
 includeInJSON: '_id'
-},
+}
 },
 {
 type: Backbone.HasMany,
 key: "edges",
 relatedModel: Edge,
 reverseRelation: {
 key: 'project',
 includeInJSON: '_id'
-},
+}
 }
 ],
 addUser: function(_props, _options) {
 _props.project = this;
 var _user = User.findOrCreate(_props);
 this.get("edges").remove(_model);
 },
 validate: function(options) {
 var _project = this;
 _(options.users).each(function(_item) {
-_item.project = _project;
+if(_item) {
+_item.project = _project;
+}
 });
 _(options.nodes).each(function(_item) {
-_item.project = _project;
+if(_item) {
+_item.project = _project;
+}
 });
 _(options.edges).each(function(_item) {
-_item.project = _project;
+if(_item) {
+_item.project = _project;
+}
 });
 },
 // Add event handler to remove edges when a node is removed
 initialize: function() {
 var _this = this;
 });
 }
 });
 var RosterUser = Models.RosterUser = Backbone.Model.extend({
 type: "roster_user",
 idAttribute : "_id",
 constructor: function(options) {
 if (typeof options !== "undefined") {
 description: this.get("description"),
 color: this.get("color"),
 project: (this.get("project") != null)?this.get("project").get("id"):null,
 site_id: this.get("site_id")
 };
-},
+}
 });
 var UsersList = Models.UsersList = Backbone.Collection.extend({
 model: RosterUser
 });
 },
 /* Drawing an edit box with an arrow and positioning the edit box according to the position of the node/edge being edited
 * Called by Rkns.Renderer.NodeEditor and Rkns.Renderer.EdgeEditor */
 drawEditBox = function(_options, _coords, _path, _xmargin, _selector) {
 _selector.css({
-width: ( _options.tooltip_width - 2* _options.tooltip_padding ),
+width: ( _options.tooltip_width - 2* _options.tooltip_padding )
 });
 var _height = _selector.outerHeight() + 2* _options.tooltip_padding,
 _isLeft = (_coords.x < paper.view.center.x ? 1 : -1),
 _left = _coords.x + _isLeft * ( _xmargin + _options.tooltip_arrow_length ),
 _right = _coords.x + _isLeft * ( _xmargin + _options.tooltip_arrow_length + _options.tooltip_width ),
 this.text = $('<div class="Rk-Label Rk-Edge-Label">').appendTo(this.renderer.labels_$);
 this.arrow_angle = 0;
 if (this.options.editor_mode) {
 this.normal_buttons = [
 new EdgeEditButton(this.renderer, null),
-new EdgeRemoveButton(this.renderer, null),
+new EdgeRemoveButton(this.renderer, null)
 ];
 this.pending_delete_buttons = [
 new EdgeRevertButton(this.renderer, null)
 ];
 this.all_buttons = this.normal_buttons.concat(this.pending_delete_buttons);
 var _html = '',
 _this = this,
 count = 0;
 _(this.data.objects).each(function(_segment) {
-var _description = _segment.abstract,
+var _description = _segment['abstract'],
 _title = _segment.title;
 if (!search.isempty && !search.test(_title) && !search.test(_description)) {
 return;
 }
 count++;

ds_mooc_demo