gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-05 21:15:47 +01:00
Code Issues Projects Releases Wiki Activity

Make Bookmark objects live writeable.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-10 01:38:39 -05:00
parent 38c2d07ef1
commit 36205c6c0e
7 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
common/content/bookmarks.js
View File

@@ -57,11 +57,10 @@ const Bookmarks = Module("bookmarks", {
try {
let uri = util.createURI(url);
if (!force && this.isBookmarked(uri.spec))
for (let bmark in bookmarkcache)
for (var bmark in bookmarkcache)
if (bmark.url == uri.spec) {
var id = bmark.id;
if (title)
services.bookmarks.setItemTitle(id, title);
bmark.title = title;
break;
}
@@ -69,17 +68,18 @@ const Bookmarks = Module("bookmarks", {
PlacesUtils.tagging.untagURI(uri, null);
PlacesUtils.tagging.tagURI(uri, tags);
}
if (id == undefined)
id = services.bookmarks.insertBookmark(
if (bmark == undefined)
bmark = bookmarkcache.bookmarks[
services.bookmarks.insertBookmark(
services.bookmarks[unfiled ? "unfiledBookmarksFolder" : "bookmarksMenuFolder"],
uri, -1, title || url);
if (!id)
uri, -1, title || url)];
if (!bmark)
return false;
if (post !== undefined)
PlacesUtils.setPostDataForBookmark(id, post);
bmark.post = post;
if (keyword)
services.bookmarks.setKeywordForBookmark(id, keyword);
bmark.keyword = keyword;
}
catch (e) {
dactyl.log(e, 0);

5
common/content/completion.js
View File

@@ -527,9 +527,8 @@ const CompletionContext = Class("CompletionContext", {
// A simple binary search to find the longest substring
// of the given string which also matches the current
// item's text.
var m, len = substring.length;
var n = substring.length;
var i = 0;
let len = substring.length;
let i = 0, m, n = len;
while (n) {
m = Math.floor(n / 2);
let keep = compare(fixCase(item.text), substring.substring(0, i + m));

6
common/modules/base.jsm
View File

@@ -887,7 +887,7 @@ function Struct() {
let args = Array.slice(arguments);
const Struct = Class("Struct", StructBase, {
length: args.length,
members: args
members: array.toObject(args.map(function (v, k) [v, k]))
});
args.forEach(function (name, i) {
Struct.prototype.__defineGetter__(name, function () this[i]);
@@ -909,7 +909,7 @@ let StructBase = Class("StructBase", Array, {
// Iterator over our named members
__iterator__: function () {
let self = this;
return ([k, self[k]] for (k in values(self.members)))
return ([k, self[k]] for (k in keys(self.members)))
}
}, {
fromArray: function (ary) {
@@ -928,7 +928,7 @@ let StructBase = Class("StructBase", Array, {
* the default value.
*/
defaultValue: function (key, val) {
let i = this.prototype.members.indexOf(key);
let i = this.prototype.members[key];
this.prototype.__defineGetter__(i, function () (this[i] = val.call(this)));
this.prototype.__defineSetter__(i, function (value)
Class.replaceProperty(this, i, value));

24
common/modules/bookmarkcache.jsm
View File

@@ -13,10 +13,25 @@ defineModule("bookmarkcache", {
const Bookmark = Struct("url", "title", "icon", "post", "keyword", "tags", "id");
const Keyword = Struct("keyword", "title", "icon", "url");
Bookmark.defaultValue("icon", function () BookmarkCache.getFavicon(this.url));
Bookmark.setter = function (key, func) this.prototype.__defineSetter__(key, func);
Bookmark.prototype.__defineGetter__("extra", function () [
["keyword", this.keyword, "Keyword"],
["tags", this.tags.join(", "), "Tag"]
].filter(function (item) item[1]));
Bookmark.setter("url", function (val) {
let tags = this.tags;
this.tags = null;
services.bookmarks.changeBookmarkURI(this.id, val);
this.tags = tags;
});
Bookmark.setter("title", function (val) { services.bookmarks.setItemTitle(this.id, val); });
Bookmark.setter("post", function (val) { bookmarkcache.annotate(this.id, bookmarkcache.POST, val); });
Bookmark.setter("keyword", function (val) { services.bookmarks.setKeywordForBookmark(this.id, val); });
Bookmark.setter("tags", function (val) {
services.tagging.untagURI(this.uri, null);
if (val)
services.tagging.tagURI(this.uri, val);
});
const name = "bookmark-cache";
@@ -52,6 +67,13 @@ const BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver),
return Bookmark(node.uri, node.title, node.icon && node.icon.spec, post, keyword, tags, node.itemId);
},
annotate: function (id, key, val) {
if (val)
services.annotation.setItemAnnotation(id, key, val, 0, services.annotation.EXPIRE_NEVER);
else if (services.annotation.itemHasAnnotation(id, key))
services.annotation.removeItemAnnotation(id, key);
},
get: function (url) {
let ids = services.bookmarks.getBookmarkIdsForURI(util.newURI(url), {});
for (let id in values(ids))
@@ -142,7 +164,7 @@ const BookmarkCache = Module("BookmarkCache", XPCOM(Ci.nsINavBookmarkObserver),
if (property == "tags")
value = services.tagging.getTagsForURI(util.newURI(bookmark.url), {});
if (property in bookmark) {
bookmark[property] = value;
bookmark[bookmark.members[property]] = value;
storage.fireEvent(name, "change", { __proto__: bookmark, changed: property });
}
}

2
common/modules/highlight.jsm
View File

@@ -15,7 +15,7 @@ const Highlight = Struct("class", "selector", "sites",
"default", "value", "agent",
"base", "baseClass", "style");
Highlight.liveProperty = function (name, prop) {
let i = this.prototype.members.indexOf(name);
let i = this.prototype.members[name];
this.prototype.__defineGetter__(name, function () this[i]);
this.prototype.__defineSetter__(name, function (val) {
this[i] = val;

2
common/modules/styles.jsm
View File

@@ -18,7 +18,7 @@ const namespace = "@namespace html " + XHTML.uri.quote() + ";\n" +
const Sheet = Struct("name", "id", "sites", "css", "system", "agent");
Sheet.liveProperty = function (name) {
let i = this.prototype.members.indexOf(name);
let i = this.prototype.members[name];
this.prototype.__defineGetter__(name, function () this[i]);
this.prototype.__defineSetter__(name, function (val) {
this[i] = val;

26
common/modules/template.jsm
View File

@@ -11,14 +11,17 @@ defineModule("template", {
});
default xml namespace = XHTML;
XML.ignoreWhiteSpace = true;
XML.prettyPrinting = false;
function fixXML() {
XML.ignoreWhiteSpace = false;
XML.prettyPrinting = false;
}
const Template = Module("Template", {
add: function add(a, b) a + b,
join: function join(c) function (a, b) a + c + b,
map: function map(iter, func, sep, interruptable) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
if (iter.length) // FIXME: Kludge?
iter = array.iterValues(iter);
let ret = <></>;
@@ -78,6 +81,7 @@ const Template = Module("Template", {
var desc = this.processor[1].call(this, item, item.description);
}
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
// <e4x>
return <div highlight={highlightGroup || "CompItem"} style="white-space: nowrap">
<!-- The non-breaking spaces prevent empty elements
@@ -108,6 +112,7 @@ const Template = Module("Template", {
// if "processStrings" is true, any passed strings will be surrounded by " and
// any line breaks are displayed as \n
highlight: function highlight(arg, processStrings, clip) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
// some objects like window.JSON or getBrowsers()._browsers need the try/catch
try {
let str = clip ? util.clip(String(arg), clip) : String(arg);
@@ -173,6 +178,7 @@ const Template = Module("Template", {
},
highlightSubstrings: function highlightSubstrings(str, iter, highlight) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
if (typeof str == "xml")
return str;
if (str == "")
@@ -205,6 +211,7 @@ const Template = Module("Template", {
</>,
jumps: function jumps(index, elems) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
// <e4x>
return <table>
<tr style="text-align: left;" highlight="Title">
@@ -224,6 +231,7 @@ const Template = Module("Template", {
},
options: function options(title, opts) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
// <e4x>
return <table>
<tr highlight="Title" align="left">
@@ -255,6 +263,7 @@ const Template = Module("Template", {
}
}
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
return <a xmlns:dactyl={NS} dactyl:command="buffer.viewSource"
href={url} line={frame.lineNumber}
highlight="URL">{
@@ -263,8 +272,8 @@ const Template = Module("Template", {
},
table: function table(title, data, indent) {
let table =
// <e4x>
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
let table = // <e4x>
<table>
<tr highlight="Title" align="left">
<th colspan="2">{title}</th>
@@ -285,6 +294,7 @@ const Template = Module("Template", {
tabular: function tabular(headings, style, iter) {
// TODO: This might be mind-bogglingly slow. We'll see.
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
// <e4x>
return <table>
<tr highlight="Title" align="left">
@@ -307,6 +317,7 @@ const Template = Module("Template", {
},
usage: function usage(iter) {
XML.ignoreWhitespace = false; XML.prettyPrinting = false;
// <e4x>
return <table>
{
@@ -314,10 +325,9 @@ const Template = Module("Template", {
<tr>
<td style="padding-right: 20px" highlight="Usage">{
let (name = item.name || item.names[0], frame = item.definedAt)
!frame ? name : <>
<span highlight="Title">{name}</span>&#xa0;
<span highlight="LineInfo">Defined at&#xa0;{template.sourceLink(frame)}</span>
</>
!frame ? name :
<span highlight="Title">{name}</span> + <> </> +
<span highlight="LineInfo">Defined at {template.sourceLink(frame)}</span>
}</td>
<td>{item.description}</td>
</tr>)