From 52ef1132e899f67be8ddc33f6c3ce0b1b7a81e1b Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Wed, 12 Jun 2013 09:30:23 -0700 Subject: [PATCH 01/12] Bug 881386 - DeviceStorage: Add .default attribute to webidl. r=Ms2ger --- dom/devicestorage/DeviceStorage.h | 2 ++ dom/devicestorage/nsDeviceStorage.cpp | 13 ++++++++++--- dom/webidl/DeviceStorage.webidl | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dom/devicestorage/DeviceStorage.h b/dom/devicestorage/DeviceStorage.h index 11b7817bbe7..3f2b0d99010 100644 --- a/dom/devicestorage/DeviceStorage.h +++ b/dom/devicestorage/DeviceStorage.h @@ -224,6 +224,8 @@ public: already_AddRefed UsedSpace(ErrorResult& aRv); already_AddRefed Available(ErrorResult& aRv); + bool Default(); + // Uses XPCOM GetStorageName static void CreateDeviceStorageFor(nsPIDOMWindow* aWin, diff --git a/dom/devicestorage/nsDeviceStorage.cpp b/dom/devicestorage/nsDeviceStorage.cpp index 89c877618d4..5fa3e357630 100644 --- a/dom/devicestorage/nsDeviceStorage.cpp +++ b/dom/devicestorage/nsDeviceStorage.cpp @@ -3043,11 +3043,18 @@ nsDOMDeviceStorage::GetRootDirectoryForFile(const nsAString& aName, nsIFile** aR return ds->mRootDirectory->Clone(aRootDirectory); } -NS_IMETHODIMP -nsDOMDeviceStorage::GetDefault(bool* aDefault) { +bool +nsDOMDeviceStorage::Default() +{ nsString defaultStorageName; GetWritableStorageName(mStorageType, defaultStorageName); - *aDefault = mStorageName.Equals(defaultStorageName); + return mStorageName.Equals(defaultStorageName); +} + +NS_IMETHODIMP +nsDOMDeviceStorage::GetDefault(bool* aDefault) +{ + *aDefault = Default(); return NS_OK; } diff --git a/dom/webidl/DeviceStorage.webidl b/dom/webidl/DeviceStorage.webidl index 72c4385cc1a..faa25374858 100644 --- a/dom/webidl/DeviceStorage.webidl +++ b/dom/webidl/DeviceStorage.webidl @@ -44,4 +44,8 @@ interface DeviceStorage : EventTarget { // Note that the storageName is just a name (like sdcard), and doesn't // include any path information. readonly attribute DOMString storageName; + + // Determines if this storage area is the one which will be used by default + // for storing new files. + readonly attribute boolean default; }; From ccb30ab6378f8956776e9a6273e804d7d5109244 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Thu, 13 Jun 2013 01:05:55 +0800 Subject: [PATCH 02/12] Bug 882105 - Typo error breaking NetworkManager.js. r=vicamo --- dom/system/gonk/NetworkManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- dom/system/gonk/NetworkManager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dom/system/gonk/NetworkManager.js b/dom/system/gonk/NetworkManager.js index 3c82d8ce9fd..924528abb87 100644 --- a/dom/system/gonk/NetworkManager.js +++ b/dom/system/gonk/NetworkManager.js @@ -259,8 +259,8 @@ NetworkManager.prototype = { break; case TOPIC_INTERFACE_REGISTERED: let regNetwork = subject.QueryInterface(Ci.nsINetworkInterface); - debug("Network '" + regNetwork.name + "' registered, adding mmsproxy and/or mmsc route"); if (regNetwork.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) { + debug("Network '" + regNetwork.name + "' registered, adding mmsproxy and/or mmsc route"); let mmsHosts = this.resolveHostname( [ Services.prefs.getCharPref("ril.mms.mmsproxy"), Services.prefs.getCharPref("ril.mms.mmsc") ] @@ -270,8 +270,8 @@ NetworkManager.prototype = { break; case TOPIC_INTERFACE_UNREGISTERED: let unregNetwork = subject.QueryInterface(Ci.nsINetworkInterface); - debug("Network '" + regNetwork.name + "' unregistered, removing mmsproxy and/or mmsc route"); if (unregNetwork.type == Ci.nsINetworkInterface.NETWORK_TYPE_MOBILE_MMS) { + debug("Network '" + unregNetwork.name + "' unregistered, removing mmsproxy and/or mmsc route"); let mmsHosts = this.resolveHostname( [ Services.prefs.getCharPref("ril.mms.mmsproxy"), Services.prefs.getCharPref("ril.mms.mmsc") ] From ddf6d1acc0840f8619e18f41736df4f62a1dfc2c Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 12:39:04 -0700 Subject: [PATCH 03/12] Bumping gaia.json for 2 gaia-central revision(s) Truncated some number of revisions since the previous bump. ======== https://hg.mozilla.org/integration/gaia-central/rev/418fb1023fcf Author: Francisco Borja Salguero Castellano Desc: Merge pull request #10291 from ian-liu/mms/Bug877940_Animation_for_sending_should_not_show_while_editing_messages_list Bug 877940 - [SMS] Animation for sending should not show when in Edit/Delete messages list ======== https://hg.mozilla.org/integration/gaia-central/rev/783c08823b4c Author: ian-liu Desc: Bug 877940 - [SMS] Animation for sending should not show when in Edit/Delete messages list --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index e023f4e1bb2..ca435a9ab5d 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "repo_path": "/integration/gaia-central", - "revision": "3f5bb84585fc" + "revision": "418fb1023fcfd47d25c3e6a5d711597d0a25a24a", + "repo_path": "/integration/gaia-central" } From b0e37e25b641decb52cb4135b93ab852033510d3 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 12:52:34 -0700 Subject: [PATCH 04/12] Bumping gaia.json for 3 gaia-central revision(s) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/547747b7b564 Author: Rick Waldron Desc: Bug 881823 - [SMS][MMS] Regression. Contact search results style lost r=borjasalguero https://bugzilla.mozilla.org/show_bug.cgi?id=881823 Signed-off-by: Rick Waldron ======== https://hg.mozilla.org/integration/gaia-central/rev/44c84445dc78 Author: Fabien Cazenave Desc: Merge pull request #10268 from fabi1cazenave/mmsThumbnails-bug876467 Bug 878042 - [MMS] image placeholder style, r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/700943a71923 Author: Fabien Cazenave Desc: Bug 878042 - [MMS] image placeholder style, r=julienw • apply the thumbnail style specs that have been defined by the UX team; • for image attachments, generate a real thumbnail of the attachment rather than relying on a CSS background -- this allows to revoke the Object URL early, so we can get rid of a few hacks (= the in the frame template and the setTimeout() in the onload listener); • display the attachment size with an appropriate unit (KB or MB). --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index ca435a9ab5d..99bbc42a824 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "418fb1023fcfd47d25c3e6a5d711597d0a25a24a", + "revision": "547747b7b56404a26c7bd9f3a6fb00e546a6d835", "repo_path": "/integration/gaia-central" } From 9920a1529eae35499a59353f611b7f0b538873df Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 12:52:54 -0700 Subject: [PATCH 05/12] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/eec3dee37636 Author: Dale Harvey Desc: Merge pull request #10343 from daleharvey/882107 Bug 882107 - Dont call missing restartPreview. r=julienw ======== https://hg.mozilla.org/integration/gaia-central/rev/6ec841589398 Author: Dale Harvey Desc: Bug 882107 - Dont call missing restartPreview --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 99bbc42a824..c10f884f7fb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "547747b7b56404a26c7bd9f3a6fb00e546a6d835", + "revision": "eec3dee3763638adb144e4634fe5e36933fb94a1", "repo_path": "/integration/gaia-central" } From 52ff5be9fde5b623724328cdc45170cc13e68cf0 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 12:53:14 -0700 Subject: [PATCH 06/12] Bumping gaia.json for 2 gaia-central revision(s) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/c9c41e296046 Author: Salvador de la Puente González Desc: Merge pull request #10322 from lodr/bug-880215-check-config-before-processing Bug 880215 - Adding some missing autoclose situations. r=:arcturus ======== https://hg.mozilla.org/integration/gaia-central/rev/b02fffeb683b Author: lodr Desc: Bug 880215 - Check configuration before processing. Adding some missing autoclose situations --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c10f884f7fb..3631223852c 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "eec3dee3763638adb144e4634fe5e36933fb94a1", + "revision": "c9c41e2960467d51785fb806c4c4d93cba575809", "repo_path": "/integration/gaia-central" } From 3cf6d76d104e9ed4957feb921a92fe48a243f29a Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 13:03:14 -0700 Subject: [PATCH 07/12] Bumping gaia.json for 1 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/65faf08691b0 Author: Lawrence Mandel Desc: Bug 843437 - Warning message in debug builds due to UA overrides r=dhylands --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 3631223852c..6e611110445 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c9c41e2960467d51785fb806c4c4d93cba575809", + "revision": "65faf08691b03f5a7485ecd420afb59033aa8e10", "repo_path": "/integration/gaia-central" } From e44066087831a77b4a2c8512785eeb54187a07c7 Mon Sep 17 00:00:00 2001 From: Reuben Morais Date: Wed, 12 Jun 2013 13:48:20 -0700 Subject: [PATCH 08/12] Bug 879537 - Be more strict when setting Date properties of contacts. r=gwagner --HG-- extra : rebase_source : 61741dc83d4b1e4ca0a9bd7bae070fcb1aed63d1 --- dom/contacts/ContactManager.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dom/contacts/ContactManager.js b/dom/contacts/ContactManager.js index e28acc7a340..9b084d88061 100644 --- a/dom/contacts/ContactManager.js +++ b/dom/contacts/ContactManager.js @@ -417,7 +417,9 @@ Contact.prototype = { }, set bday(aBday) { - if (aBday !== undefined && aBday !== null) { + if (aBday instanceof Date) { + this._bday = aBday; + } else if (typeof aBday === "string" || typeof aBday === "number") { this._bday = new Date(aBday); } }, @@ -427,7 +429,9 @@ Contact.prototype = { }, set anniversary(aAnniversary) { - if (aAnniversary !== undefined && aAnniversary !== null) { + if (aAnniversary instanceof Date) { + this._anniversary = aAnniversary; + } else if (typeof aAnniversary === "string" || typeof aAnniversary === "number") { this._anniversary = new Date(aAnniversary); } }, From 8b8bb6b99fea53ed46f0a590c5fc3e66be5c97bf Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 16:37:26 -0700 Subject: [PATCH 09/12] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/6351c94ef82b Author: Jim Porter Desc: Merge pull request #10332 from mozsquib/settings-storage-name Bug 880059 - External SD card storage listed as "internal" in Settings ======== https://hg.mozilla.org/integration/gaia-central/rev/24904623863a Author: Jim Porter Desc: Bug 880059 - External SD card storage listed as "internal" in Settings; r=dhylands --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 6e611110445..f2581fd7fdc 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "65faf08691b03f5a7485ecd420afb59033aa8e10", + "revision": "6351c94ef82be2fcf4157325b313b6b4a96727de", "repo_path": "/integration/gaia-central" } From 61fd29f266b1f3918d71c9e40bf4afdbf4d6b476 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 16:47:25 -0700 Subject: [PATCH 10/12] Bumping gaia.json for 4 gaia-central revision(s) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/e0863efffa89 Author: Michael Henretty Desc: Merge pull request #10325 from KevinGrandon/bug_881744_clock_files Bug 881744 - Lazy load alarm edit page ======== https://hg.mozilla.org/integration/gaia-central/rev/00e7f355859a Author: Kevin Grandon Desc: Bug 881744 - Lazy load alarm edit page ======== https://hg.mozilla.org/integration/gaia-central/rev/1f9692e96a78 Author: Staś Małolepszy Desc: Merge pull request #10302 from mcirlanaru/bug_881310 Bug 881310 - Add Serbian (Cyrillic) entry. r=stas ======== https://hg.mozilla.org/integration/gaia-central/rev/58fefc604727 Author: Mihai Cirlanaru Desc: Bug 881310 - Add Serbian (Cyrillic) entry --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index f2581fd7fdc..c7355711ec9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "6351c94ef82be2fcf4157325b313b6b4a96727de", + "revision": "e0863efffa89fe7b8dfdfb9530ac1f0a6b1736d6", "repo_path": "/integration/gaia-central" } From 367258d7e371ecab34d0b7216c18240656bfb658 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 16:47:46 -0700 Subject: [PATCH 11/12] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/c8bffe868520 Author: David Flanagan Desc: Merge pull request #10352 from davidflanagan/bug882197 Bug 882197: remember cursor position after calling replaceSurroundingText r=dhylands ======== https://hg.mozilla.org/integration/gaia-central/rev/19cdfadf93a9 Author: David Flanagan Desc: Bug 882197: remember cursor position after calling replaceSurroundingText --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index c7355711ec9..2cf8a2d715e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "e0863efffa89fe7b8dfdfb9530ac1f0a6b1736d6", + "revision": "c8bffe868520d2136080002f314aedd1841d0220", "repo_path": "/integration/gaia-central" } From 202763e02389e0668785a9c6b44d3fae0d7a48b5 Mon Sep 17 00:00:00 2001 From: Gaia Pushbot Date: Wed, 12 Jun 2013 17:46:20 -0700 Subject: [PATCH 12/12] Bumping gaia.json for 2 gaia-central revision(s) ======== https://hg.mozilla.org/integration/gaia-central/rev/7a4b216668ae Author: Michael Henretty Desc: Merge pull request #10331 from KevinGrandon/bug_881743_clock_lazy_dom Bug 881743 - Lazy load alarm edit dom ======== https://hg.mozilla.org/integration/gaia-central/rev/10753a5f5475 Author: Kevin Grandon Desc: Bug 881743 - Lazy load alarm edit dom --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 2cf8a2d715e..0ea1f9e260a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,4 +1,4 @@ { - "revision": "c8bffe868520d2136080002f314aedd1841d0220", + "revision": "7a4b216668aebe56f71c17dde2ff619bfd005aa7", "repo_path": "/integration/gaia-central" }