From 6e6b9ebec293ad33fd6ec67f106ec4c3b6568a35 Mon Sep 17 00:00:00 2001 From: "axel%pike.org" Date: Mon, 4 Sep 2006 15:47:50 +0000 Subject: [PATCH] bug 348731, add bookmarks view, fix upper/lowercasing git-svn-id: svn://10.0.0.236/trunk@209131 18797224-902f-48f8-a5cc-f745e15eee43 --- .../testing/tests/l10n/lib/Mozilla/Parser.py | 9 +- .../testing/tests/l10n/web/bookmarks-code.js | 144 ++++++++++++++++++ mozilla/testing/tests/l10n/web/index.html | 1 + 3 files changed, 149 insertions(+), 5 deletions(-) create mode 100755 mozilla/testing/tests/l10n/web/bookmarks-code.js diff --git a/mozilla/testing/tests/l10n/lib/Mozilla/Parser.py b/mozilla/testing/tests/l10n/lib/Mozilla/Parser.py index 255210650f7..eaeb29997cc 100755 --- a/mozilla/testing/tests/l10n/lib/Mozilla/Parser.py +++ b/mozilla/testing/tests/l10n/lib/Mozilla/Parser.py @@ -129,14 +129,13 @@ class BookmarksParser(Parser): r += getProps(c, base + '.' + str(i)) else: for k,v in c.iteritems(): - k = k.lower() - if k == u'href': + if k == u'HREF': r.append(('%s.%i.href'%(base, i), v)) - if k == u'feedurl': + if k == u'FEEDURL': r.append(('%s.%i.feedurl'%(base, i), v)) elif k == u'__title__': r.append(('%s.%i.title'%(base, i), v)) - elif k == u'icon': + elif k == u'ICON': r.append(('%s.%i.icon'%(base, i), v)) return r return getProps(self.getDetails(), 'bookmarks').__iter__() @@ -146,7 +145,7 @@ class BookmarksParser(Parser): def parse_link(f, line): link = {} for m in re.finditer('(?P[A-Z]+)="(?P[^"]+)', line): - link[m.group('key')] = m.group('val') + link[m.group('key').upper()] = m.group('val') m = re.search('"[ ]*>([^<]+)', line, re.I) link[u'__title__'] = m.group(1) f[u'children'].append(link) diff --git a/mozilla/testing/tests/l10n/web/bookmarks-code.js b/mozilla/testing/tests/l10n/web/bookmarks-code.js new file mode 100755 index 00000000000..e62cd53d186 --- /dev/null +++ b/mozilla/testing/tests/l10n/web/bookmarks-code.js @@ -0,0 +1,144 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla. + * + * The Initial Developer of the Original Code is + * Mozilla Foundation. + * Portions created by the Initial Developer are Copyright (C) 2006 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Axel Hecht + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + + +var bookmarksView = { + __proto__: baseView, + setUpHandlers: function() { + _t = this; + }, + destroyHandlers: function() { + }, + // Helper methods + createFullTree: function ct(aDetails, aNode, aName) { + if (!aDetails || ! (aDetails instanceof Object)) + return; + var cat = new YAHOO.widget.TextNode(aName, aNode, true); + for each (postfix in ["Files", ""]) { + var subRes = aDetails[aName + postfix]; + var append = postfix ? ' (files)' : ''; + for (mod in subRes) { + var mn = new YAHOO.widget.TextNode(mod + append, cat, true); + for (fl in subRes[mod]) { + if (postfix) { + new YAHOO.widget.TextNode(subRes[mod][fl], mn, false); + continue; + } + var fn = new YAHOO.widget.TextNode(fl, mn, false); + var keys = []; + for each (k in subRes[mod][fl]) { + keys.push(k); + } + new YAHOO.widget.HTMLNode("
" + keys.join("\n") + "
", fn, true, false); + } + } + } + return cat; + } +}; +var bookmarksController = { + __proto__: baseController, + beforeSelect: function() { + this.result = {}; + this.isShown = false; + bookmarksView.setUpHandlers(); + var _t = this; + var callback = function(obj) { + delete _t.req; + if (view != bookmarksView) { + // ignore, we have switched again + return; + } + _t.result = obj; + bookmarksView.updateView(keys(_t.result)); + }; + this.req = JSON.get('results/' + this.tag + '/bookmarks-results.json', callback); + }, + beforeUnSelect: function() { + if (this.req) { + this.req.abort(); + delete this.req; + } + bookmarksView.destroyHandlers(); + }, + showView: function(aClosure) { + // json onload handler does this; + }, + getContent: function(aLoc) { + var row = view.getCell(); + var inner = document.createElement('div'); + row.appendChild(inner); + var r = this.result[aLoc]; + var id = "bookmarks-" + aLoc; + inner.id = id; + var hasDetails = true; + t = new YAHOO.widget.TreeView(inner); + var d = this.result[aLoc]; + var innerContent = d['__title__']; + function createChildren(aData, aParent, isOpen) { + if ('children' in aData) { + // Folder + innerContent = aData['__title__']; + if ('__desc__' in aData && aData['__desc__']) { + innerContent += '
' + aData['__desc__'] + ''; + } + var nd = new YAHOO.widget.HTMLNode(innerContent, aParent, isOpen, true); + for each (child in aData['children']) { + createChildren(child, nd, true); + } + } + else { + // Link + innerContent = ''; + if ('ICON' in aData) { + innerContent = ''; + } + innerContent += '' + + aData['__title__'] + ''; + if ('FEEDURL' in aData) { + innerContent += ' (FEED)'; + } + new YAHOO.widget.HTMLNode(innerContent, aParent, false, false); + } + } + createChildren(d, t.getRoot(), false); + t.draw(); + return row; + } +}; +controller.addPane('Bookmarks', 'bookmarks', bookmarksController, + bookmarksView); diff --git a/mozilla/testing/tests/l10n/web/index.html b/mozilla/testing/tests/l10n/web/index.html index ca0765d8b71..1b03bebb925 100644 --- a/mozilla/testing/tests/l10n/web/index.html +++ b/mozilla/testing/tests/l10n/web/index.html @@ -66,6 +66,7 @@ +