diff -r 89408208d1d0 -r 9222643acf89 mozilla/browser/components/flock/common/content/tree.js
--- a/mozilla/browser/components/flock/common/content/tree.js Thu Jan 12 18:09:08 2006 +0100
+++ b/mozilla/browser/components/flock/common/content/tree.js Wed Jan 11 23:09:20 2006 -0800
@@ -44,6 +44,9 @@
// Send to a handler
if (obj.value == "twisty") {
this.performAction("onTwisty", row.value, col.value);
+ }
+ else if ((col.value.cycler || col.type == "checkbox")) {
+ this.mNode.view.cycleCell(row.value, col.value);
}
else {
var mods = this.split(aEvent);
diff -r 89408208d1d0 -r 9222643acf89 mozilla/browser/components/flock/common/jar.mn
--- a/mozilla/browser/components/flock/common/jar.mn Thu Jan 12 18:09:08 2006 +0100
+++ b/mozilla/browser/components/flock/common/jar.mn Wed Jan 11 23:09:20 2006 -0800
@@ -26,7 +26,6 @@
skin/classic/browser/flock/common/blue.png (skin/classic/blue.png)
skin/classic/browser/flock/common/slideyhandle.png (skin/classic/slideyhandle.png)
skin/classic/browser/flock/common/slideyBG.png (skin/classic/slideyBG.png)
- skin/classic/browser/flock/common/plus.png (skin/classic/plus.png)
skin/classic/browser/flock/common/close_active.png (skin/classic/close_active.png)
skin/classic/browser/flock/common/close_inactive.png (skin/classic/close_inactive.png)
skin/classic/browser/flock/common/close_hover.png (skin/classic/close_hover.png)
diff -r 89408208d1d0 -r 9222643acf89 mozilla/browser/components/flock/favorites/content/favorites.js
--- a/mozilla/browser/components/flock/favorites/content/favorites.js Thu Jan 12 18:09:08 2006 +0100
+++ b/mozilla/browser/components/flock/favorites/content/favorites.js Wed Jan 11 23:09:20 2006 -0800
@@ -204,27 +204,6 @@
}
flock.browser.openFeeds(feedList, aWhere);
};/*}}}*/
-flock.favorites.refreshFeedsForCollection = function (aCollection) {/*{{{*/
- flock.require('flock.feed.feed');
- var collection = flock.favorites.getCollection(aCollection);
- var feedList = [];
- for (var i = 0; i < collection.items.length; ++i) {
- var item = collection.items[i];
- XXX('FOR EACH ITEM', item);
- if (flock.favorites.isFeed(item)) {
- XXX('ITS A FEED');
- feedList.push(item.url);
- }
- else if (item.hasFeeds) {
- XXX('IT HAS FEEDS');
- for (var j = 0; j < item.feeds.length; ++j) {
- XXX('FOREACH FEED');
- feedList.push(item.feeds[j].url);
- }
- }
- }
- flock.feed.refreshFeeds(feedList);
-};/*}}}*/
flock.favorites.viewFeeds = function (aItemList, aWhere) {/*{{{*/
var feedList = [];
for (var i = 0; i < aItemList.length; ++i) {
@@ -247,26 +226,6 @@
}
}
flock.browser.openFeeds(feedList, aWhere);
-
-};/*}}}*/
-flock.favorites.refreshFeeds = function (aItemList) {/*{{{*/
- var feedList = [];
- for (var i = 0; i < aItemList.length; ++i) {
- var item = aItemList[i];
- if (flock.favorites.isFeed(item)) {
- item = flock.favorites.getFeed(item);
- feedList.push(item.url);
- }
- else {
- item = flock.favorites.getFavorite(item);
- if (item.hasFeeds) {
- for (var j = 0; j < item.feeds.length; ++j) {
- feedList.push(item.feeds[j].url);
- }
- }
- }
- }
- flock.feed.refreshFeeds(feedList);
};/*}}}*/
flock.favorites.openCollectionInTabs = function (aCollection) {/*{{{*/
diff -r 89408208d1d0 -r 9222643acf89 mozilla/browser/components/flock/favorites/content/favoritesManager.js
--- a/mozilla/browser/components/flock/favorites/content/favoritesManager.js Thu Jan 12 18:09:08 2006 +0100
+++ b/mozilla/browser/components/flock/favorites/content/favoritesManager.js Wed Jan 11 23:09:20 2006 -0800
@@ -182,13 +182,6 @@
exec: function () {
var selected = this.mNode.selectedItem;
flock.favorites.viewFeedsForCollection(selected.id, 'window');
- }
- },/*}}}*/
- cmd_collectionRefreshFeeds: {/*{{{*/
- isEnabled: collectionHasFeeds,
- exec: function () {
- var selected = this.mNode.selectedItem;
- flock.favorites.refreshFeedsForCollection(selected.id);
}
},/*}}}*/
});
@@ -309,6 +302,25 @@
}
}
},/*}}}*/
+ cmd_toggleShared: function() {/*{{{*/
+ // XXX ---- all of the following should be done in the service --- as some may or may not support
+ // things like "private" ... as well as their "service" might be to not have a online service at all
+ var selected = flock_getTreeSelection(tree, ['URL', 'Name']);
+ var allFavProps = flock.favorites.getFavorite( selected[0].URL );
+ allFavProps.load();
+ var favPropsForEdit = {name:allFavProps.name, url:allFavProps.url, feed:allFavProps.feed }
+
+ // Order is local -> private -> public
+ if (allFavProps.local) {
+ flock.favorites.editItem( favPropsForEdit, {local: false, private: true});
+ } else {
+ if (allFavProps.private) {
+ flock.favorites.editItem( favPropsForEdit, {local: false, private: false});
+ } else {
+ flock.favorites.editItem( favPropsForEdit, {local: true, private: false});
+ }
+ }
+ },/*}}}*/
cmd_favoriteRename: function () { /*{{{*/
var selected = flock_getTreeSelection(tree, ['URL', 'Name']);
flock.favorites.renameItem({
@@ -370,16 +382,6 @@
return aVal.URL;
});
flock.favorites.viewFeeds(feeds, 'window');
- }
- },/*}}}*/
- cmd_favoriteRefreshFeeds: {/*{{{*/
- isEnabled: feedsSelected,
- exec: function () {
- var selected = flock_getTreeSelection(tree, ['URL']);
- var feeds = selected.map(function (aVal) {
- return aVal.URL;
- });
- flock.favorites.refreshFeeds(feeds);
}
},/*}}}*/
});
@@ -647,6 +649,14 @@
case "onDblMetaClick":
goDoCommand('cmd_favoriteOpenInTab');
break;
+ case "onClick":
+ switch (aCol) {
+ case 'sharing':
+ goDoCommand('cmd_toggleShared');
+ break;
+
+ }
+ break;
}
},/*}}}*/
onCycleCell: function (aRow, aCol) {/*{{{*/
@@ -661,16 +671,13 @@
var fav = flock.favorites.getFavorite(rsrc);
fav.load();
if (fav.local) {
- XXX('IS LOCAL, SETTING TO PUBLIC');
flock.favorites.editItem(fav, {local: false});
}
else {
if (!fav.private && flock.favorites.supportsField('private')) {
- XXX('IS PUBLIC AND PRIVATE SUPPORTED, SETTING TO PRIVATE');
flock.favorites.editItem(fav, {private: true});
}
else if (fav.private || !flock.favorites.supportsField('private')) {
- XXX('IS PRIVATE OR PRIVACY IS NOT SUPPORTED, SETTING TO LOCAL');
flock.favorites.editItem(fav, {private: false, local: true});
}
}
@@ -706,6 +713,7 @@
mOuter: this,
mInput: searchbox,
mTree: tree,
+ mClearButton: $('favoritesManagerClearSearch'),
mTreeTemplate: $('favoriteViewTemplate'),
_searchResults: null,
get searchResults() {/*{{{*/
@@ -720,8 +728,10 @@
// we are clearing the tree
this.unfilterTree();
this._searchResults = null;
+ flock.xul.hide(this.mClearButton);
}
else {
+ flock.xul.show(this.mClearButton);
this._searchResults = aDataSource;
flock.rdf.addDataSources(this.mTree,
[this._searchResults]);
@@ -729,44 +739,28 @@
dump_rdf(this._searchResults);
}
this.mTree.builder.rebuild();
- },/*}}}*/
- filterTree: function () {/*{{{*/
- // find all the conditions we need to add a rule to
- var searchConditions = document.getElementsByAttribute('favoritesSearch', 'conditions');
- for (var i = 0; i < searchConditions.length; i++) {
- var conditions = searchConditions[i];
- // XXX andy: i don't think we actually need to remove old filters,
- // they'll get removed eventually via unfilterTree anyway
- // and i don't think they pose a more serious performance
- // threat than recursing over the items every time like
- // this could is doing.
- //// find old search rules to remove
- //for (var j = 0; j < conditions.childNodes.length; j++) {
- // var child = conditions.childNodes[j];
- // if (child.getAttribute ('predicate') ==
- // 'http://flock.com/rdf#searchresult') {
- // // this is one we want to remove
- // conditions.removeChild (child);
- // }
- //}
- // create a rule to match only search results
- var triple = flock.xul.createElement('triple', {
- subject: "?uri",
- predicate: "http://flock.com/rdf#searchresult",
- object: "true",
- favoritesSearch: "filter"
-
- });
-
- // and add it to the condition
- conditions.appendChild(triple);
- }
- },/*}}}*/
- unfilterTree: function () {/*{{{*/
- // find all the filters we need to remove
- var searchFilters = document.getElementsByAttribute('favoritesSearch', 'filter');
- searchFilters = flock.lang.toArray(searchFilters);
- searchFilters.forEach(dojo.dom.removeNode);
+ },
+ filterTree: function () {
+ // turn on the template rule to only show search
+ // results
+ for (var i = 0; i < this.mTreeTemplate.childNodes.length; ++i) {
+ var child = this.mTreeTemplate.childNodes[i];
+ if (child.tagName == "rule") {
+ child.setAttributeNS('http://flock.com/rdf#',
+ 'searchresult',
+ 'true');
+ }
+ }
+ },
+ unfilterTree: function () {
+ for (var i = 0; i < this.mTreeTemplate.childNodes.length; ++i) {
+ var child = this.mTreeTemplate.childNodes[i];
+ if (child.tagName == "rule") {
+ child.removeAttributeNS('http://flock.com/rdf#',
+ 'searchresult');
+ }
+ }
+
},/*}}}*/
onEnter: function () {/*{{{*/
this.mInput.clearInputTimer();
@@ -785,11 +779,6 @@
},/*}}}*/
search: function () {/*{{{*/
XXX('SEARCHIPOO');
- if (this.mInput.value == '') {
- this.unfilterTree();
- this.searchResults = null;
- return;
- }
var _this = this;
var callback = new flock.search.SearchCallback({
onResult: function (aData) {
diff -r 89408208d1d0 -r 9222643acf89 mozilla/browser/components/flock/favorites/content/favoritesManager.xul
--- a/mozilla/browser/components/flock/favorites/content/favoritesManager.xul Thu Jan 12 18:09:08 2006 +0100
+++ b/mozilla/browser/components/flock/favorites/content/favoritesManager.xul Wed Jan 11 23:09:20 2006 -0800
@@ -50,6 +50,7 @@
+
@@ -95,7 +96,6 @@
-
@@ -109,7 +109,6 @@
-
@@ -124,7 +123,6 @@
-
@@ -141,7 +139,6 @@
-
@@ -151,7 +148,6 @@
-
@@ -196,7 +192,7 @@
-
-