eulalie: comparison timeline/js/timeline.js

Mercurial Mercurial > eulalie / comparison

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

timeline/js/timeline.js

changeset 85	7a0de7ed7575
parent 84	2448fdcef656
child 87	4dc63e325f48

equal deleted inserted replaced

-:2448fdcef656
+:7a0de7ed7575
 this.throttledDrawList = _.throttle(function() {
 _this.drawList();
 }, 150);
+this.throttledShowEditingLinks = _.throttle(function() {
+_this.showEditingLinks();
+}, 150);
 this.setLevel(this.level);
 this.$.find('.Tl-TopBar-Timescales>div').click(function() {
 _this.setLevel($(this).attr("data-level"));
 });
 if (this.is_dragging) {
 switch (this.dragging_type) {
 case "occurrence":
 var _event = ( this.editing_occurrence.just_created ? "Ajout" : "MiseAJour" ) + "OccurrenceTimeline",
 _data = {
-id: ( this.editing_occurrence.just_created ? undefined : this.editing_occurrence.original_id),
+id: this.editing_occurrence.original_id,
 typeOccurrence: "Occurrence" + this.editing_occurrence.type.replace(/^./,function(_l) { return _l.toUpperCase()}),
 datePublication : Math.floor(this.editing_occurrence.date / 1000),
 titre : this.editing_occurrence.title,
 idUnivers: this.editing_occurrence.univers_id,
 statut: this.statuses[this.editing_occurrence.status],
 Tlns.Classes.Timeline.prototype.universFromMouse = function(_pageY) {
 return this.universFromY(_pageY - this.dragging_bounds.top);
 }
 Tlns.Classes.Timeline.prototype.onMouseMove = function(_event) {
-if (this.mouse_down) {
+if (this.mouse_down && !this.is_dragging) {
-this.is_dragging = true;
+var _dx = this.start_pos.x - _event.pageX,
+_dy = this.start_pos.y - _event.pageY,
+_sqd = _dx * _dx + _dy * _dy;
+if (_sqd > 16) {
+this.is_dragging = true;
+}
+}
+if (this.is_dragging) {
 this.hideTooltip();
 switch (this.dragging_type) {
 case "occurrence":
 var _d = this.timeFromMouse(_event.pageX);
 this.editing_occurrence.date = _d;
 this.$.find(".Ls-From-Date").val(Tlns.Utils.dateFormat(this.start_time, '{{0dayOfMonth}}/{{0monthNumber}}/{{year}}'));
 this.$.find(".Ls-To-Time").val(Tlns.Utils.dateFormat(this.end_time, '{{0hours}}:{{0minutes}}'));
 this.$.find(".Ls-To-Date").val(Tlns.Utils.dateFormat(this.end_time, '{{0dayOfMonth}}/{{0monthNumber}}/{{year}}'));
 this.throttledDrawGrid();
 this.throttledDrawList();
+this.throttledShowEditingLinks();
 }
 Tlns.Classes.Timeline.prototype.drawGrid = function() {
 if (this.sync_now) {
 this.$.find('.Tl-TopBar-SyncButton').addClass("active");
 .css({
 left: _x + "px",
 top: _y + "px"
 });
 this.$.find('.Tl-Overlay-Main').html(_html);
 }
 Tlns.Classes.Timeline.prototype.hideTooltip = function() {
 this.$.find('.Tl-Overlay-Box').hide();
 }
 Tlns.Classes.Timeline.prototype.drawOccurrences = function() {
-var _this = this,
+var _this = this;
-_visible = _(this.occurrences).filter(function(_occ) {
+_(this.occurrences).each(function(_occ) {
-return (_occ.date >= _this.start_time && _occ.date <= _this.end_time && _occ.status);
-});
-_(_visible).each(function(_occ) {
 _occ.x = _this.current_scale * (_occ.date - _this.start_time);
 _occ.y = _occ.univers.y;
 _occ.in_cluster = false;
+});
+var _visible = _(this.occurrences).filter(function(_occ) {
+return (_occ.date >= _this.start_time && _occ.date <= _this.end_time && _occ.status);
 });
 var _moved = true;
 while (_moved) {
 _moved = false;
 if (_cluster.contents == _this.open_cluster) {
 _openCluster = _cluster;
 }
 });
-var _links = [];
-_(_visible).each(function(_occurrence) {
-_(_occurrence.dependsOn).each(function(_dependance) {
-var _parent = _(_visible).find(function(_o) {
-return _o.id == _dependance;
-});
-if (typeof _parent !== "undefined") {
-_links.push({
-from_x: _occurrence.x,
-from_y: _occurrence.y + Math.floor(_this.univers_height / 2),
-to_x: _parent.x,
-to_y: _parent.y + Math.floor(_this.univers_height / 2)
-});
-}
-});
-});
-var _ctx = this.$.find('.Tl-Canvas')[0].getContext('2d');
-_ctx.clearRect(0,0,this.main_width, this.main_height);
-_(_links).each(function(_link) {
-Tlns.Utils.drawArrow(_ctx, "#505050", _link.from_x,_link.from_y, _link.to_x,_link.to_y);
-});
 var _html = Mustache.to_html(Tlns.Templates.Occurrence, {
 occurrences:_(_visible).reject(function(_o) {return _o.in_cluster}),
 clusters: _clusters,
 open_cluster: _openCluster
 });
 _el.find('.Tl-Link').show();
 //            }
 if (!_this.is_dragging) {
 var _html = Mustache.to_html(Tlns.Templates.OccurrenceTooltip, _occurrence);
 _this.showTooltip(_occurrence.x, _occurrence.y, _html, (_event.pageY - _this.dragging_bounds.top) >= (.4 * _this.main_height) );
+//                _this.showLinks(_id);
 }
 }
 }).mouseout(function() {
 var _el = $(this),
 _id = _el.attr("occurrence-id");
 if (typeof _id !== "undefined") {
 var _occurrence = _this.getOccurrence(_id);
 _this.hideTooltip();
 _this.$.find('.Tl-Link').hide();
+_this.throttledShowEditingLinks();
 }
 }).mouseup(function() {
 var _el = $(this);
 if (_this.dragging_type == "link") {
 var _target = _el.attr("occurrence-id");
 _this.open_cluster = false;
 } else {
 _this.open_cluster = _contents;
 }
 _this.throttledDrawGrid();
+_this.throttledShowEditingLinks();
 })
 }
 Tlns.Classes.Timeline.prototype.drawList = function() {
 var _universfilter = this.$.find(".Ls-Univers li.Ls-Active").map(function(){return $(this).attr("data")}),
 }
 this.$.find(".Ls-Occurrences").html(
 Mustache.to_html(
 Tlns.Templates.Occurrence_List,
 {
-occurrences: this.occurrences.filter(function(_occ) {
+occurrences: _(this.occurrences).chain().filter(function(_occ) {
 var _titletest = (!!_occ.title.match(_titleregexp)),
 _keep = (
 ( !_title || _titletest )
 && _(_occtypefilter).include(_occ.type)
 && _(_universfilter).include(_occ.univers_id)
 && _(_jtfilter).include(_occ.jt)
 && ( !_fromDate || _occ.date >= _startdate )
 && ( !_toDate || _occ.date <= _enddate )
 );
 return _keep;
-})
+}).sortBy(function(_occ) {
+return _occ.date;
+}).value()
 }
 )
 );
 if (_title) {
 this.$.find(".Ls-Occurrence-Title").each(function() {
 typeOccurrence: "Occurrence" + _id.replace(/_.*$/,'').replace(/^./,function(_l) { return _l.toUpperCase()})
 }
 $("body").trigger("SelectionOccurrenceTimeline", _data);
 return false;
 });
+}
+Tlns.Classes.Timeline.prototype.showLinks = function(_id) {
+var _ctx = this.$.find('.Tl-Canvas')[0].getContext('2d');
+_ctx.clearRect(0,0,this.main_width, this.main_height);
+if (typeof _id !== "undefined") {
+var _links = [],
+_this = this;
+_(this.occurrences).each(function(_occurrence) {
+_(_occurrence.dependsOn).each(function(_dependance) {
+var _parent = _this.getOccurrence(_dependance);
+if (typeof _parent !== "undefined" && (_parent.id == _id || _occurrence.id == _id)) {
+_links.push({
+from_x: _occurrence.x,
+from_y: _occurrence.y + Math.floor(_this.univers_height / 2),
+to_x: _parent.x,
+to_y: _parent.y + Math.floor(_this.univers_height / 2)
+});
+}
+});
+});
+}
+_(_links).each(function(_link) {
+Tlns.Utils.drawArrow(_ctx, "#505050", _link.from_x,_link.from_y, _link.to_x,_link.to_y);
+});
+}
+Tlns.Classes.Timeline.prototype.showEditingLinks = function() {
+this.showLinks(typeof this.editing_occurrence !== "undefined" ? this.editing_occurrence.id : undefined);
 }
 Tlns.Classes.Timeline.prototype.getUnivers = function(_id) {
 return _(this.univers).find(function(_univ) {
 return (_univ.id == _id);

eulalie