')
.addClass("Rk-Bin-Main")
.appendTo(this.$);
+ this.title_$.html(_opts.title || '(new bin)');
this.renkan.resizeBins();
}
}
@@ -76,10 +77,10 @@
this.renderer = new Rkns.Renderer.Scene(this);
this.tabs = [];
this.selected_bin_item = undefined;
- this.mousedown = false;
var _this = this;
this.$.mouseup(function() {
_this.selected_bin_item = undefined;
+ _this.$.find(".Rk-Bin-Item.dragging").removeClass("dragging");
});
if (!_opts.search.length) {
this.$.find(".Rk-Search-Form").detach();
@@ -112,6 +113,24 @@
});
}
+ Rkns._(_opts.bins).each(function(_bin) {
+ _this.tabs.push(new _bin.bin(_this, _bin));
+ })
+
+ /* The bins are not yet populated, but we want to bind dragging functions
+ * here, as it will be easier than in the bins. Therefore, we bind to Rk-Bins
+ * and look where the click was. */
+ function findItem(_event) {
+ var _t = Rkns.$(_event.target);
+ while (!_t.is(".Rk-Bins,.Rk-Bin-Item")) {
+ _t = _t.parent();
+ }
+ if (_t.is(".Rk-Bin-Item")) {
+ return _t
+ } else {
+ return null;
+ }
+ }
this.$.find(".Rk-Bins")
.click(function(_e) {
@@ -123,11 +142,9 @@
}
}
}).mousedown(function(_e) {
- var _t = Rkns.$(_e.target);
- while (!_t.is(".Rk-Bins,.Rk-Bin-Item")) {
- _t = _t.parent();
- }
- if (_t.is(".Rk-Bin-Item")) {
+ var _t = findItem(_e);
+ if (_t) {
+ _t.addClass("dragging");
_this.selected_bin_item = {
uri : $(_t).attr("data-uri"),
title : $(_t).attr("data-title"),
@@ -135,6 +152,18 @@
}
return false;
}
+ }).mouseover(function(_e) {
+ var _t = findItem(_e);
+ if (_t && $(_t).attr("data-uri")) {
+ var _models = _this.project.get("nodes").where({
+ uri: $(_t).attr("data-uri")
+ });
+ Rkns._(_models).each(function(_model) {
+ _this.renderer.highlightModel(_model);
+ });
+ }
+ }).mouseout(function() {
+ _this.renderer.unhighlightAll();
});
Rkns.$(window).resize(function() {
_this.resizeBins();
@@ -149,8 +178,10 @@
Rkns.Renkan.prototype.resizeBins = function() {
- var _titles = this.$.find(".Rk-Bin-Title"),
- _d = _titles.length * _titles.outerHeight() + this.$.find(".Rk-Search-Form").outerHeight();
+ var _d = + this.$.find(".Rk-Search-Form").outerHeight();
+ this.$.find(".Rk-Bin-Title").each(function() {
+ _d += Rkns.$(this).outerHeight();
+ });
this.$.find(".Rk-Bin-Main").css({
height: this.$.find(".Rk-Bins").height() - _d
});
diff -r b5ada3bb8e53 -r 2fad193bae98 client/js/paper-renderer.js
--- a/client/js/paper-renderer.js Tue Aug 21 18:49:41 2012 +0200
+++ b/client/js/paper-renderer.js Wed Aug 22 16:50:42 2012 +0200
@@ -154,6 +154,10 @@
Rkns.Renderer._BaseRepresentation.prototype.unselect = function() {}
+Rkns.Renderer._BaseRepresentation.prototype.highlight = function() {}
+
+Rkns.Renderer._BaseRepresentation.prototype.unhighlight = function() {}
+
Rkns.Renderer._BaseRepresentation.prototype.mouseup = function() {}
Rkns.Renderer._BaseRepresentation.prototype.destroy = function() {}
@@ -217,6 +221,13 @@
this.edit_button.show();
this.remove_button.show();
this.link_button.show();
+ var _uri = this.model.get("uri");
+ Rkns.$('.Rk-Bin-Item').each(function() {
+ var _el = Rkns.$(this);
+ if (_el.attr("data-uri") == _uri) {
+ _el.addClass("selected");
+ }
+ });
}
Rkns.Renderer.Node.prototype.unselect = function(_newTarget) {
@@ -226,6 +237,15 @@
this.link_button.hide();
}
this.circle.strokeWidth = 1;
+ Rkns.$('.Rk-Bin-Item').removeClass("selected");
+}
+
+Rkns.Renderer.Node.prototype.highlight = function() {
+ this.circle.fillColor = "#ffffc0";
+}
+
+Rkns.Renderer.Node.prototype.unhighlight = function(_newTarget) {
+ this.circle.fillColor = "#ffffff";
}
Rkns.Renderer.Node.prototype.mouseup = function(_event) {
@@ -237,6 +257,7 @@
Rkns.Renderer.Node.prototype.destroy = function(_event) {
this.edit_button.destroy();
this.remove_button.destroy();
+ this.link_button.destroy();
this.circle.remove();
this.title.remove();
}
@@ -432,7 +453,7 @@
Rkns.Renderer.NodeEditor.prototype.template = Rkns._.template(
'
×<%=l10n.edit_node%>
'
+ '
'
- + '
'
+ + '
'
+ '
'
+ '
<%=node.created_by_title%>
'
);
@@ -460,6 +481,7 @@
paper.view.draw();
});
this.editor_$.find("input, textarea").bind("keyup change", function() {
+ _this.editor_$.find(".Rk-Edit-Goto").attr("href",_this.editor_$.find(".Rk-Edit-URI").val());
var _data = {
title: _this.editor_$.find(".Rk-Edit-Title").val(),
description: _this.editor_$.find(".Rk-Edit-Description").val(),
@@ -503,7 +525,7 @@
Rkns.Renderer.EdgeEditor.prototype.template = Rkns._.template(
'
×<%=l10n.edit_edge%>
'
+ '
'
- + '
'
+ + '
'
+ '
<%=edge.from_title%>
'
+ '
<%=edge.to_title%>
'
+ '
<%=edge.created_by_title%>
'
@@ -850,15 +872,17 @@
);
Rkns.Renderer.Scene.prototype.autoScale = function() {
- var _xx = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").x }),
- _yy = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").y }),
- _minx = Math.min.apply(Math, _xx),
- _miny = Math.min.apply(Math, _yy),
- _maxx = Math.max.apply(Math, _xx),
- _maxy = Math.max.apply(Math, _yy);
- this.scale = Math.min((paper.view.size.width - 2 * this._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * this._MARGIN_Y) / (_maxy - _miny));
- this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(this.scale));
- this.redraw();
+ if (this.renkan.project.get("nodes").length) {
+ var _xx = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").x }),
+ _yy = this.renkan.project.get("nodes").map(function(_node) { return _node.get("position").y }),
+ _minx = Math.min.apply(Math, _xx),
+ _miny = Math.min.apply(Math, _yy),
+ _maxx = Math.max.apply(Math, _xx),
+ _maxy = Math.max.apply(Math, _yy);
+ this.scale = Math.min((paper.view.size.width - 2 * this._MARGIN_X) / (_maxx - _minx), (paper.view.size.height - 2 * this._MARGIN_Y) / (_maxy - _miny));
+ this.offset = paper.view.center.subtract(new paper.Point([(_maxx + _minx) / 2, (_maxy + _miny) / 2]).multiply(this.scale));
+ this.redraw();
+ }
}
Rkns.Renderer.Scene.prototype.toPaperCoords = function(_point) {
@@ -918,6 +942,19 @@
});
}
+Rkns.Renderer.Scene.prototype.highlightModel = function(_model) {
+ var _repr = this.getRepresentationByModel(_model);
+ if (_repr) {
+ _repr.highlight();
+ }
+}
+
+Rkns.Renderer.Scene.prototype.unhighlightAll = function(_model) {
+ Rkns._(this.representations).each(function(_repr) {
+ _repr.unhighlight();
+ });
+}
+
Rkns.Renderer.Scene.prototype.redraw = function() {
Rkns._(this.representations).each(function(_representation) {
_representation.redraw();
diff -r b5ada3bb8e53 -r 2fad193bae98 client/js/twitter-bin.js
--- a/client/js/twitter-bin.js Tue Aug 21 18:49:41 2012 +0200
+++ b/client/js/twitter-bin.js Wed Aug 22 16:50:42 2012 +0200
@@ -15,7 +15,7 @@
Rkns.Bins.Twitter.prototype._init = function(_renkan, _opts) {
this.search = _opts.search;
- this.title_$.html('Twitter: "' + this.search + '"')
+ this.title_$.html('Twitter: "' + this.search + '"');
var _this = this;
Rkns.$.getJSON(
"http://search.twitter.com/search.json?q=" + encodeURIComponent(this.search) + "&callback=?",
@@ -88,6 +88,7 @@
});
}).join("");
_this.main_$.html(_html);
+ _renkan.resizeBins();
}
);
}
diff -r b5ada3bb8e53 -r 2fad193bae98 client/js/wikipedia-bin.js
--- a/client/js/wikipedia-bin.js Tue Aug 21 18:49:41 2012 +0200
+++ b/client/js/wikipedia-bin.js Wed Aug 22 16:50:42 2012 +0200
@@ -3,14 +3,14 @@
Rkns.Bins.Wikipedia.prototype.resultTemplate = Rkns._.template(
'
'
- + ''
+ + ''
+ '<%=result.snippet%>
'
);
Rkns.Bins.Wikipedia.prototype._init = function(_renkan, _opts) {
this.search = _opts.search;
this.lang = _opts.lang || "en";
- this.title_$.html(_opts.title + ': "' + this.search + '"')
+ this.title_$.html(_opts.title + ': "' + this.search + '"');
var _this = this;
Rkns.$.getJSON(
"http://" + _this.lang + ".wikipedia.org/w/api.php?action=query&list=search&srsearch=" + encodeURIComponent(this.search) + "&format=json&callback=?",
@@ -25,6 +25,7 @@
});
}).join("");
_this.main_$.html(_html);
+ _renkan.resizeBins();
}
);
}
\ No newline at end of file
diff -r b5ada3bb8e53 -r 2fad193bae98 client/render-test.html
--- a/client/render-test.html Tue Aug 21 18:49:41 2012 +0200
+++ b/client/render-test.html Wed Aug 22 16:50:42 2012 +0200
@@ -19,12 +19,37 @@
+
-
Renkan Top Bar