From 1af6b0dd7cce0a90759fc4c75b978f603e7ccb6f Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Tue, 29 Jun 2010 09:19:50 -0400 Subject: [PATCH 01/21] Bug 575508 - [e10s] Add consts and QI to fake webNavigation object [r=vingtetun] --- mobile/chrome/content/bindings/browser.xml | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/mobile/chrome/content/bindings/browser.xml b/mobile/chrome/content/bindings/browser.xml index e2819798c90b..913b95efa194 100644 --- a/mobile/chrome/content/bindings/browser.xml +++ b/mobile/chrome/content/bindings/browser.xml @@ -406,6 +406,27 @@ From f22189c6e62863993883badc2bfa98587d94f884 Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Tue, 29 Jun 2010 09:24:56 -0400 Subject: [PATCH 02/21] Bug 575477 - Error in nsIAutoCompletePopup::invalidate [r=vingtetun] --- mobile/chrome/content/bindings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/chrome/content/bindings.xml b/mobile/chrome/content/bindings.xml index 90b247da4922..2810c5f4b1ae 100644 --- a/mobile/chrome/content/bindings.xml +++ b/mobile/chrome/content/bindings.xml @@ -255,7 +255,7 @@ let title = controller.getCommentAt(i); let tags = ''; - if (type == "tag") + if (title && type == "tag") [, title, tags] = title.match(/^(.+) \u2013 (.+)$/); item.setAttribute("tags", tags); From c92b8fa0183e008e1d40ebd1d21199335ba22267 Mon Sep 17 00:00:00 2001 From: Mark Finkle Date: Tue, 29 Jun 2010 10:49:36 -0400 Subject: [PATCH 03/21] Bug 571898 - port 1.4 Sync UI for Fennec to mobile-browser [r=mbrubeck] --- mobile/app/mobile.js | 5 + mobile/chrome/content/aboutTabs.xhtml | 174 ++++++++++++++++ mobile/chrome/content/browser.xul | 18 ++ mobile/chrome/content/sync.js | 192 ++++++++++++++++++ mobile/chrome/jar.mn | 2 + mobile/components/AboutRedirector.js | 15 +- mobile/confvars.sh | 1 + mobile/locales/en-US/chrome/aboutTabs.dtd | 1 + mobile/locales/en-US/chrome/preferences.dtd | 8 + mobile/locales/jar.mn | 1 + mobile/themes/hildon/aboutTabs.css | 50 +++++ mobile/themes/hildon/browser.css | 12 ++ .../hildon/images/remotetabs-active-64.png | Bin 0 -> 1915 bytes .../hildon/images/remotetabs-default-64.png | Bin 0 -> 1559 bytes .../hildon/images/remotetabs-disabled-64.png | Bin 0 -> 1610 bytes mobile/themes/hildon/images/tab-32.png | Bin 0 -> 345 bytes mobile/themes/hildon/jar.mn | 5 + 17 files changed, 483 insertions(+), 1 deletion(-) create mode 100644 mobile/chrome/content/aboutTabs.xhtml create mode 100644 mobile/chrome/content/sync.js create mode 100644 mobile/locales/en-US/chrome/aboutTabs.dtd create mode 100644 mobile/themes/hildon/aboutTabs.css create mode 100644 mobile/themes/hildon/images/remotetabs-active-64.png create mode 100644 mobile/themes/hildon/images/remotetabs-default-64.png create mode 100644 mobile/themes/hildon/images/remotetabs-disabled-64.png create mode 100644 mobile/themes/hildon/images/tab-32.png diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js index 3f40fb6eb6df..39abbba2ca09 100644 --- a/mobile/app/mobile.js +++ b/mobile/app/mobile.js @@ -474,3 +474,8 @@ pref("font.default.x-western", "SwissA"); // See bug 545869 for details on why these are set the way they are pref("network.buffer.cache.count", 24); pref("network.buffer.cache.size", 16384); + +// sync service +pref("services.sync.client.type", "mobile"); +pref("services.sync.registerEngines", "Tab,Bookmarks,Form,History,Password"); +pref("services.sync.autoconnectDelay", 5); diff --git a/mobile/chrome/content/aboutTabs.xhtml b/mobile/chrome/content/aboutTabs.xhtml new file mode 100644 index 000000000000..0ad7371d9741 --- /dev/null +++ b/mobile/chrome/content/aboutTabs.xhtml @@ -0,0 +1,174 @@ + + + +%remoteTabsDTD; +]> + + + &remoteTabs.title; + + + + +
+
+ + + + diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul index cde02ee819bc..ede12bfa94d2 100644 --- a/mobile/chrome/content/browser.xul +++ b/mobile/chrome/content/browser.xul @@ -86,6 +86,7 @@