Commit Graph

3613 Commits

Author SHA1 Message Date
Bill McCloskey
91adbce542 Bug 1069059 - [e10s] Convert isWindowPrivate calls to isBrowserPrivate/isContentWindowPrivate as appropriate (r=mconley,margaret) 2014-09-23 15:48:52 -07:00
Sam Penrose
fae39b42ae Bug 1065477 - Bind FxAccountsProfileClientError to global this for B2G. r=ferjm 2014-09-11 16:02:20 -07:00
Alan K
e00db21e9c Bug 1052009 - Enable CloudSync in Nightly (mochitest fix). r=gps 2014-09-10 14:54:00 +02:00
Sam Penrose
171d11b40a Bug 1064613 - Move server-side account deletion block in _handleGetAssertionError(). r=ferjm 2014-09-08 16:45:03 -07:00
Richard Newman
8df888a22f Bug 1064132 - Listen for wake_notification to evaluate whether to sync. r=markh 2014-09-09 17:16:24 -07:00
Ryan VanderMeulen
93bf6bf6a0 Merge inbound to m-c. a=merge 2014-09-09 19:26:59 -04:00
Sam Penrose
b75166dca7 Bug 1064606 - Update FxAccountsManager tests with Principal. r=ferjm
CLOSED TREE
2014-09-08 16:32:10 -07:00
Fernando Jiménez
c481bc89e2 Bug 1064303 - After adding new SIM with MSISDN on device, the mobile ID dialog doesn't show up with "Get Assertion" with the new phone number. r=spenrose 2014-09-09 16:09:25 +02:00
Benjamin Smedberg
fab6ce367b Bug 1053745 - Add GMP plugin data to FHR, r=gfritzsche
--HG--
extra : rebase_source : d60d6740369f51168e2d176549b9495df5245143
2014-09-05 11:17:00 -04:00
Alan K
635f49e75e Bug 993584 - Initial landing for CloudSync. r=rnewman 2014-09-04 21:44:00 +02:00
Ryan VanderMeulen
d57ca8703d Merge inbound to m-c. a=merge 2014-09-03 16:38:57 -04:00
Fernando Jiménez
4d5ffd0520 Bug 1044051 - MobileIdentityClient tests. r=spenrose 2014-09-03 16:21:41 +02:00
Fernando Jiménez
8c7cbd6354 Bug 1045581 - [MobileID] The Mobile ID flow can't be completed with a manually inserted phone number. r=spenrose 2014-09-03 16:21:41 +02:00
Cosmin Malutan
69c4263a09 Bug 1062224 - [tps] Fix test_tabs.js for non-existent testcase pages. r=hskupin DONTBUILD 2014-09-03 13:06:38 +02:00
ffxbld
02d1667716 Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-09-02 12:54:33 -04:00
Ryan VanderMeulen
779fbedf06 Merge fx-team to m-c. a=merge 2014-08-30 12:26:22 -04:00
Henrik Skupin
e8d03fc60e Backout of 7cb26c341a4e due to new TPS sync failures 2014-08-29 22:37:44 +02:00
vladikoff
442b9b45ab Bug 1058424 - Fixes network error tests in the FxA Profile Client r=mattn 2014-08-29 10:25:41 -07:00
Carsten "Tomcat" Book
8a43aaa3f7 merge fx-team to mozilla-central a=merge 2014-08-29 15:13:15 +02:00
vladikoff
c55602d2b3 Bug 1058424 - Adds a module for fetching FxA profile information. r=MattN 2014-08-28 16:10:00 +02:00
Chris Karlof
f512448501 Bug 1059391 - Add pref to disable caching of Sync authentication credentials. r=markh
This introduces a debugging pref, "services.sync.debug.ignoreCachedAuthCredentials".
This flag allows testers to disable caching of authentication credentials
to make debugging of expired and revoked credentials easier. This will
help expedite any visble auth errors resulting from a expired or revoked
FxA session token, e.g., from resetting or changing the FxA password.
This pref is not set by default.
2014-08-28 17:21:03 -07:00
Carsten "Tomcat" Book
21ba18e307 Merge mozilla-central to mozilla-inbound 2014-08-28 16:13:13 +02:00
Wes Kocher
c08a9ad3b4 Merge m-c to fx-team a=merge 2014-08-27 17:07:39 -07:00
Chris Karlof
1114899311 Bug 1056523 - Ensure sync credentials are reset during reauth flow. r=markh
This patch addresses a bug in the following scenario:

User has browser 1 connected to sync and open, and resets her password
on browser 2. Eventually the browser detects the need to reauthenticate
the user, and prompts the user. When the user entered her new password,
the browserid_identity module failed to re-derive a new syncKeyBundle
from the new password and happily used the old one. Chaos ensued.

This patch mitigate the problem by calling resetCredentials at the
start of initializeWithCurrentIdentity(), which will clear the
syncKeyBundle, along with other credentials. Previously this
function was only resetting this._shouldHaveSyncKeyBundle.

I also removed a misleading comment about the syncKeyBundle being
cleared when it wasn't.
2014-08-27 16:14:58 -07:00
Cosmin Malutan
ed62d63b5f Bug 682446 - Wait a little before we trigger the Sync call to be sure elements are ready to be synced. r=hskupin DONTBUILD
---
 services/sync/tps/extensions/tps/resource/tps.jsm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
2014-08-28 11:24:01 +02:00
Florian Quèze
7065d9b196 Bug 838458 - Fix 'rest.js - setting a property that has only a getter' warnings, r=rnewman. 2014-08-27 16:52:21 +02:00
Birunthan Mohanathas
404b11dccf Bug 1024672 - Part 4: Add workaround to continue providing submission data using DailyCrashesMeasurement. r=gps 2014-08-21 15:43:54 -07:00
Birunthan Mohanathas
b809847eaf Bug 1024672 - Part 3: Remove CrashManager.addSubmission in favor of CrashManager.addSubmission{Attempt,Result}. r=gps 2014-08-21 15:43:50 -07:00
Ed Morley
30ed9ba40d Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-20 15:14:31 +01:00
Bill McCloskey
98bdfe240c Bug 1046964 - Fix some JS warnings (r=ttaubert) 2014-08-19 17:27:58 -07:00
Gregory Szorc
9b928cab7a Bug 1055102 - Properly handle Unicode in Bagheera payloads; r=bsmedberg
It was observed that FHR was sending invalid JSON payloads to the
server. Specifically, JSON payloads contained invalid Unicode strings.

Investigation revealed that the culprint was CommonUtils.convertString()
silently swallowing high bytes. When the Bagheera client went to gzip
the JSON payload, the input buffer into gzip was missing high bytes.

This patch changes the bagheera client to UTF-8 encode strings before
gzip, thus ensuring all data is preserved. A corresponding change was
also added to the mock bagheera server implementation.

Alternatively, we could have changed CommonUtils.convertString() to
be high byte aware. However, many consumers rely on this function.
This patch is written with the intent of being uplifted and the change
performed is targeted at the specific problem.

Tests for Unicode preserving behavior have been added to both the
generic Bagheera client and to FHR. The latter test is arguably
not necessary, but peace of mind is a good thing, especially with
FHR.

See also bug 915850.

--HG--
extra : rebase_source : 4efddea7767c2e5f8cf19df247c3aba07c40eec6
extra : amend_source : ae3b6d89efa54fc9ed1794404476622946ad4b22
2014-08-19 09:12:12 -07:00
Daniel Holbert
5c9114c8e3 Bug 1055643: Drop "let" keyword to fix JS warning about redeclaring argument, in stripHeaderAttributes(). r=ckarlof 2014-08-19 12:29:34 -07:00
Ed Morley
59a42bee67 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-19 14:32:54 +01:00
Mark Hammond
52cf7ad1eb Bug 1053948 - declare AccountState in fxAccounts. r=gavin 2014-08-19 08:47:37 +10:00
Matthew Noorenberghe
c78ed65993 Bug 1047130 - Implement desktop backend to login to FxA via OAuth for Loop. r=vladikoff,ckarlof,mikedeboer
This implements the OAuth authorization phase.
2014-08-18 14:32:34 -07:00
Nathan Froyd
072b3b906e Bug 1045617 - move services's run_server.py Makefile rules into mach; r=gps 2014-07-30 15:44:13 -04:00
Nathan Froyd
08483fe6ee Bug 1054476 - move INSTALL_TARGETS in services/ Makefiles to EXTRA_{PP_,}JS_MODULES; r=gps 2014-07-28 15:24:01 -04:00
Nathan Froyd
be58364116 Bug 1054476 - use PREF_JS_EXPORTS in services/ Makefiles; r=gps 2014-07-28 14:42:26 -04:00
Georg Fritzsche
3ec162d8ae Bug 862563 - Remove implicit acceptance for data reporting notification and notify on first run. r=gps
The data reporting notification was over-complicated. It wasn't
displayed for +24hr after first run and it had a weird, non-required
policy around what constituted acceptance of the policy.

The notification is now shown shortly after first startup.

The logic around "notification accepted" has been greatly simplified by
rolling it into "notification shown." Where we once were checking
whether the notification has been "accepted," we now check whether it
has been displayed. The overly complicated logic around the implicit
acceptance of the policy has also been removed.

The end result is the code for managing the state of the notification is
greatly simplified.
2014-07-09 14:32:29 -07:00
Gregory Szorc
ec27c4e647 Bug 1053315 - Catch more errors during upload; r=bsmedberg
If recording FHR data during uploading raised an exception, it could
potentially abort the upload. This would appear to Mozilla as clients
that suddenly stopped using Firefox.

This patch adds explicit exception trapping around event record to
ensure this doesn't happen.

--HG--
extra : rebase_source : 7cd207b08a4f62be55093c71cb56e28832fd39d8
extra : amend_source : 9144ecea16a013370fffa5c2e833af4ec528ef5b
2014-08-13 11:18:22 -07:00
Edgar Chen
289493fbd0 Bug 843452 - Part 4-8: [MobileIdentityManager] Get {voice|data}Info via MobileConnectionService. r=ferjmoreno 2014-08-11 16:24:27 +08:00
Drew Willcoxon
2258afd165 Bug 1009765 - Add GMP plugin crashes to FHR crash reporting (part 2: FHR, toolkit/components/crashes). r=gps 2014-08-08 15:41:07 -07:00
Birunthan Mohanathas
e3009122fa Bug 1048989 - Fix 'useless expression' warnings with MERGED_COMPONENT. r=gps 2014-08-07 21:52:05 -07:00
Nathan Froyd
7d196c1018 Bug 1042226 - move DEFINES += -DAB_CD=$(AB_CD) pattern into config.mk; r=mshal 2014-08-01 12:53:05 -04:00
Daniel Holbert
d326bd0616 Bug 1049035: Don't redeclare arg 'msg', in health report function '_recordProviderError'. r=gps 2014-08-05 22:35:30 -07:00
Mark Hammond
45f144f9e9 Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
Mark Hammond
99dd5b9fe6 Bug 1013064 (part 4) - browserid_identity and sync changes to support FxA credentials in the login manager. r=ckarlof,rnewman
From 9717484083e66b78eedfa14e539d51382aba760f Mon Sep 17 00:00:00 2001
---
 services/sync/modules/browserid_identity.js        | 61 ++++++++++++++++++++--
 services/sync/modules/identity.js                  | 19 +++++++
 services/sync/modules/service.js                   | 20 ++++---
 .../sync/tests/unit/test_browserid_identity.js     | 15 ++++++
 4 files changed, 102 insertions(+), 13 deletions(-)
2014-06-14 14:33:56 +10:00
Mark Hammond
c7ca4f45e5 Bug 1013064 (part 3) - only migrate data into the loginmgr when it is unlocked. r=ckarlof
From 86c67f9b9081ce905442c86b38575b3422c8dce3 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 |  25 ++++-
 .../tests/xpcshell/test_loginmgr_storage.js        | 113 +++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
2014-06-18 15:07:41 +10:00
Mark Hammond
c864319e62 Bug 1013064 (part 2) - Store sensitive FxA credentials in the login manager. r=ckarlof,dveditz
From 4a92f9ee1ba35989f82a24bba18806f8616a5be8 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 | 170 ++++++++++++++++++
 services/fxaccounts/FxAccountsCommon.js            |  13 ++
 services/fxaccounts/moz.build                      |   5 +-
 .../tests/xpcshell/test_loginmgr_storage.js        | 196 +++++++++++++++++++++
 services/fxaccounts/tests/xpcshell/xpcshell.ini    |   2 +
 services/sync/modules/util.js                      |  12 +-
 6 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
2014-06-14 14:33:20 +10:00
Mark Hammond
b43e626535 Bug 1013064 (part 1) - prompt for master-password unlock when interacting with about:accounts. r=ttaubert
From 18f9d132020afee6004e63c9006245e4d3b04e18 Mon Sep 17 00:00:00 2001
---
 browser/base/content/aboutaccounts/aboutaccounts.js | 9 +++++++++
 1 file changed, 9 insertions(+)
2014-06-11 17:34:24 +10:00
Ryan VanderMeulen
331f439833 Merge m-c to fx-team. a=merge 2014-08-01 16:08:39 -04:00
Vlad Filippov
25df45a615 Bug 1022064 - Add WebChannel Communication API and FxAccountsOAuthClient API to facilitate Firefox Accounts OAuth authentication. r=MattN, sr=gavin 2014-08-01 01:42:00 -04:00
Cosmin Malutan
e236bd8da2 Bug 990509 - Wait a second after tabs opening before finishing the sync operation. r=aeftimie, r=rnewman 2014-07-31 00:54:00 -04:00
Carsten "Tomcat" Book
283616b382 Merge mozilla-central to mozilla-inbound 2014-07-30 14:10:53 +02:00
Nathan Froyd
4246e6b6ea Bug 1044162 - part 1 - make EXTRA_{PP_,}JS_MODULES communicate their installation path; r=mshal
This patch makes EXTRA_{PP_,}JS_MODULES similar in functionality to
TESTING_JS_MODULES: we indicate the path relative to
$(FINAL_TARGET)/modules with an appropriate hierarchy of paths.
2014-07-25 13:40:07 -04:00
Wes Kocher
1f3bb5e64f Merge m-c to fx-team 2014-07-29 17:21:24 -07:00
Wes Kocher
99840a8247 Merge b2g-inbound to m-c a=merge 2014-07-29 16:42:15 -07:00
Gregory Szorc
d5fdf7be88 Bug 1014524 - Add HotfixProvider to XPCOM manifest; r=rnewman
--HG--
extra : rebase_source : 09108f61288d86f2739945ffa9efc79b9587c72a
2014-07-29 11:11:51 -07:00
Gregory Szorc
4c3a010d92 Bug 1014524 - Report update hotfix results in FHR; r=rnewman
The v20140527.01 update hotfix deposited a JSON file in the profile
directory containing state. This file was purposefully not deleted
during hotfix uninstall so its contents could be later reported in
FHR.

This patch adds that reporting to FHR.

Currently, we only report a subset of the available fields. The
remaining "public" fields could be added easily enough. For now, it is
important that we capture the important ones.

--HG--
extra : rebase_source : 925d6ea04118296108327dc843323b150b87b208
2014-07-25 12:25:06 -07:00
Mike Hommey
20d181268e Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
Nathan Froyd
80686692d8 Bug 1044041 - remove now-unnecessary rule from services/healthreport/Makefile.in; r=gps 2014-07-25 11:11:28 -04:00
Alexandre Poirot
5a3800bc64 Bug 1027242 - Blacklist mulet's failing tests + expose 'mulet' to ini files; fix previous bustage on a CLOSED TREE, r=ahal 2014-07-02 15:40:56 -07:00
ffxbld
ba070e96be Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-07-21 14:19:15 -07:00
Neil Deakin
e2716d6158 Bug 1013064, backout e5dfe9801f76, 11f3a97d1d2c, e2374762f521, 91db8acb8d7e, d0050ba0b875 due to sync issues 2014-07-21 09:09:41 -04:00
Fernando Jiménez
3d53cd7afd Bug 1044792 - Send MCC and MNC on POST /sms/mt/verify. r=spenrose 2014-07-29 14:27:03 +02:00
Mark Hammond
22e4e7c883 Bug 1013064 (part 5) - stop disabling the password engine when MP enabled. r=ttaubert
From 07aa9cc1fcd5479976effe29f6adf5ad5ba7a8f8 Mon Sep 17 00:00:00 2001
2014-06-12 18:19:49 +10:00
Mark Hammond
cacfa57d0d Bug 1013064 (part 4) - browserid_identity and sync changes to support FxA credentials in the login manager. r=ckarlof,rnewman
From 9717484083e66b78eedfa14e539d51382aba760f Mon Sep 17 00:00:00 2001
---
 services/sync/modules/browserid_identity.js        | 61 ++++++++++++++++++++--
 services/sync/modules/identity.js                  | 19 +++++++
 services/sync/modules/service.js                   | 20 ++++---
 .../sync/tests/unit/test_browserid_identity.js     | 15 ++++++
 4 files changed, 102 insertions(+), 13 deletions(-)
2014-06-14 14:33:56 +10:00
Mark Hammond
d7d7cc7303 Bug 1013064 (part 3) - only migrate data into the loginmgr when it is unlocked. r=ckarlof
From 86c67f9b9081ce905442c86b38575b3422c8dce3 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 |  25 ++++-
 .../tests/xpcshell/test_loginmgr_storage.js        | 113 +++++++++++++++++++++
 2 files changed, 137 insertions(+), 1 deletion(-)
2014-06-18 15:07:41 +10:00
Mark Hammond
a44155a2a4 Bug 1013064 (part 2) - Store sensitive FxA credentials in the login manager. r=ckarlof
From 4a92f9ee1ba35989f82a24bba18806f8616a5be8 Mon Sep 17 00:00:00 2001
---
 services/fxaccounts/FxAccounts.jsm                 | 170 ++++++++++++++++++
 services/fxaccounts/FxAccountsCommon.js            |  13 ++
 services/fxaccounts/moz.build                      |   5 +-
 .../tests/xpcshell/test_loginmgr_storage.js        | 196 +++++++++++++++++++++
 services/fxaccounts/tests/xpcshell/xpcshell.ini    |   2 +
 services/sync/modules/util.js                      |  12 +-
 6 files changed, 396 insertions(+), 2 deletions(-)
 create mode 100644 services/fxaccounts/tests/xpcshell/test_loginmgr_storage.js
2014-06-14 14:33:20 +10:00
Ryan VanderMeulen
c39e71e72f Merge fx-team to m-c. a=merge 2014-07-11 16:22:36 -04:00
Fernando Jiménez
2423e4fc3a Bug 1028398 - FxA will silently provide user's email to privileged apps in 2.0. Part 2: Trigger forceAuth when new privileged app tries to get a FxA assertion. r=jedp" 2014-07-11 16:13:32 +02:00
Steven MacLeod
dd374a7fc4 Bug 1035337 - Introduce API to record when the infobar is hidden due to "Never translate this language/site". r=felipe
--HG--
extra : rebase_source : 04dd1e060efad6160997194ba1b128c7f8a5db36
extra : histedit_source : be5f46896497e1bef1aa5ace5850793c4556527d
2014-07-10 18:31:56 -04:00
Fernando Jiménez
5885aa0953 Bug 1033238 - Cannot revoke Mobile ID permission. r=jedp 2014-07-11 14:56:57 +02:00
Fernando Jiménez
9a27f6101c Bug 1023780 - Ensure that Mobile ID client support the 401/110 error (invalid token) properly. r=jedp 2014-07-11 14:56:56 +02:00
Kartikaya Gupta
4ff5fbdfab Bug 1036444 - Kill touchenter and touchleave events. r=smaug 2014-07-09 10:27:00 -04:00
Jed Parsons
206e207871 Bug 1036198 - rejection not defined in _handleGetAssertionError. r=spenrose 2014-07-08 18:00:25 -07:00
Wes Kocher
7cf37526f7 Merge m-c to inbound 2014-07-08 20:04:41 -07:00
Fernando Jiménez
fb1f792423 Bug 1022181 - Mobile ID Tests. Part 2: Mobile Identity Service Tests. r=jedp 2014-07-08 19:57:44 +02:00
Fernando Jiménez
878f922292 Bug 1026999 - Mobile ID - SIM change scenario is not working. r=jedp 2014-07-08 19:57:43 +02:00
Steve Workman
20fec6e951 Bug 982816 - Remove extra calls to nextTest in test_hawkrequest.js r=ckarlof 2014-07-08 11:44:03 -07:00
Carsten "Tomcat" Book
518f246c5e merge fx-team to mozilla-central a=merge 2014-07-08 15:10:56 +02:00
Gregory Szorc
54c4d3b9ae Bug 1033836 - Convert TESTING_JS_MODULES to moz.build; r=glandium
--HG--
extra : rebase_source : 1cd9e402c507260358af7a93c6fb2fc91c24994b
2014-07-02 16:43:41 -07:00
Gregory Szorc
cd3dbd7747 Bug 1033836 - Rename services-common to services/common; rs=rnewman
The upcoming build system patches don't support hypthens in path names.
Changing this for that reason is kind of silly, but it's the easiest
way. Besides, nothing else uses hyphens in directory names.

--HG--
extra : rebase_source : 42dda2b1f16a3c0bfe17397a70092362e400530f
2014-07-02 16:49:36 -07:00
Andrew Comminos
e31c58cd7c Bug 958868 - Add support for delta line and page accumulation; r=masayuki, sr=smaug 2014-07-07 18:54:14 +09:00
Mark Banner
daf2fe32a4 Bug 1032017 Remove MOZ_SERVICES_FXACCOUNTS flags as it is no longer necessary. Also fixes test_hawkrequest.js failures in m-c. r=glandium 2014-07-08 07:37:57 +01:00
Steven MacLeod
84d99bb465 Bug 994707 - Introduce crash submission events and handle them. r=bsmedberg
This introduces a new crash event type for submissions and handles
them in the Crash Manager. These crash submissions will also be counted
in FHR.

--HG--
extra : rebase_source : c37fc86cecc86aea0afdd8cfa7b31295aad3d6f8
2014-07-03 14:04:28 -04:00
Fernando Jiménez
655abdbc17 Bug 1021595 - Set "services.mobileid.forcehttps" to true once the server is https. r=jedp 2014-07-03 11:56:34 +02:00
Sam Penrose
d63c4f0720 Bug 1031580 - FxA fires ONLOGIN only for calling RP. r=jedp 2014-07-01 10:31:17 -07:00
Fernando Jiménez
837bd9f64b Bug 1022193 - Add a "forceIdSelection" to navigator.getMobileIdAssertion. Part 3: MobileIdentityManager. r=jedp 2014-06-27 01:18:21 +02:00
Fernando Jiménez
c4f75adcc2 Bug 1023266 - Make the Mobile ID API privileged. Part 2: Fix permission check. r=jedp 2014-06-27 01:18:20 +02:00
Gregory Szorc
90626e2426 Bug 1029031 - Record default search provider in FHR; r=bsmedberg, MattN
--HG--
extra : rebase_source : 7e3c2688db567bac8760c405d9e9d7d41e8564d9
extra : amend_source : a5f4264ec947ae27e3036018034e0b17bf1e8590
2014-06-25 12:44:00 -07:00
Benjamin Smedberg
48059d7b02 Bug 1017806 - Record and report on optional branches of experiments, so that each experiment doesn't have to re-invent data collection. r=gfritzsche 2014-06-25 15:16:13 -04:00
Jim Blandy
4d6a633bba Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Ed Morley
632b40c1f3 Merge mozilla-central and fx-team 2014-06-24 17:24:53 +01:00
Ed Morley
4ffd0ec330 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-06-24 17:02:56 +01:00
Asaf Romano
982ce9f2a8 Bug 977770 - Count the times users manually adjust the offered translation pair. r=felipe. 2014-06-24 16:53:30 +03:00
Carsten "Tomcat" Book
8be0d4bc98 Backed out changeset 8499eefa342e (bug 958868) for m2 test failures on a CLOSED TREE 2014-06-24 12:49:47 +02:00
Asaf Romano
3e6f5e623c Bug 973294 - Count the number of times 'Show Original' is used. r=felipe. 2014-06-24 11:41:52 +03:00
Carsten "Tomcat" Book
d99c075833 Backed out changeset 895eeb7bddb8 (bug 973294) for bc1 test failures 2014-06-24 09:13:34 +02:00
Felipe Gomes
9f17866dcd Bug 1024757 - Follow up, update example documentation. r=felipe. 2014-06-24 08:45:00 +03:00