Skip to content
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
2 parents 03387c1 + 5803383 commit 7cbb70a717fd508fddc547912d90bccb988348ea @michalbe michalbe committed Jul 7, 2012
Showing with 30 additions and 36 deletions.
  1. +7 −7 apps/settings/index.html
  2. +4 −2 apps/settings/js/settings.js
  3. +19 −27 build/settings.js
View
14 apps/settings/index.html
@@ -839,10 +839,10 @@ <h2 data-l10n-id="debug">Debug</h2>
<form action="#">
<label>
<span data-l10n-id="password">password</span>
- <input data-wep name="password" type="password" />
+ <input data-wep data-ignore name="password" type="password" />
</label>
<label>
- <input name="show-pwd" type="checkbox" />
+ <input data-ignore name="show-pwd" type="checkbox" />
<span data-l10n-id="showPassword">show password</span>
</label>
</form>
@@ -864,10 +864,10 @@ <h2 data-l10n-id="debug">Debug</h2>
<form action="#">
<label>
<span data-l10n-id="password">password</span>
- <input data-psk name="password" type="password" />
+ <input data-psk data-ignore name="password" type="password" />
</label>
<label>
- <input name="show-pwd" type="checkbox" />
+ <input data-ignore name="show-pwd" type="checkbox" />
<span data-l10n-id="showPassword">show password</span>
</label>
</form>
@@ -889,14 +889,14 @@ <h2 data-l10n-id="debug">Debug</h2>
<form action="#">
<label>
<span data-l10n-id="identity">identity</span>
- <input data-identity name="identity" type="text" />
+ <input data-identity data-ignore name="identity" type="text" />
</label>
<label>
<span data-l10n-id="password">password</span>
- <input data-password name="password" type="password" />
+ <input data-password data-ignore name="password" type="password" />
</label>
<label>
- <input name="show-pwd" type="checkbox" />
+ <input data-ignore name="show-pwd" type="checkbox" />
<span data-l10n-id="showPassword">show password</span>
</label>
</form>
View
6 apps/settings/js/settings.js
@@ -15,7 +15,8 @@ var Settings = {
var transaction = settings.getLock();
// preset all checkboxes
- var checkboxes = document.querySelectorAll('input[type="checkbox"]');
+ var rule = 'input[type="checkbox"]:not([data-ignore])';
+ var checkboxes = document.querySelectorAll(rule);
for (var i = 0; i < checkboxes.length; i++) {
(function(checkbox) {
var key = checkbox.name;
@@ -47,7 +48,8 @@ var Settings = {
}
// preset all text inputs
- var texts = document.querySelectorAll('input[type="text"]');
+ var rule = 'input[type="text"]:not([data-ignore])';
+ var texts = document.querySelectorAll(rule);
for (var i = 0; i < texts.length; i++) {
(function(text) {
var key = text.name;
View
46 build/settings.js
@@ -21,7 +21,12 @@ var settings = [
new Setting("debug.grid.enabled", false),
new Setting("debug.fps.enabled", false),
new Setting("debug.paint-flashing.enabled", false),
+ new Setting("devtools.debugger.force-local", true),
+ new Setting("devtools.debugger.log", false),
+ new Setting("devtools.debugger.remote-enabled", false),
+ new Setting("devtools.debugger.remote-port", 6000),
new Setting("homescreen.ring", 'classic.wav'),
+ new Setting("homescreen.wallpaper", "default.png"),
new Setting("keyboard.layouts.english", true),
new Setting("keyboard.layouts.dvorak", false),
new Setting("keyboard.layouts.otherlatins", false),
@@ -31,48 +36,35 @@ var settings = [
new Setting("keyboard.layouts.zhuyin", false),
new Setting("keyboard.layouts.pinyin", false),
new Setting("keyboard.layouts.greek", false),
+ new Setting("keyboard.layouts.japanese", false),
+ new Setting("keyboard.layouts.portuguese", false),
+ new Setting("keyboard.layouts.spanish", false),
new Setting("keyboard.vibration", false),
new Setting("keyboard.clicksound", false),
new Setting("language.current", "en-US"),
new Setting("lockscreen.passcode-lock.enabled", false),
new Setting("lockscreen.enabled", false),
+ new Setting("lockscreen.wallpaper", "default.png"),
new Setting("phone.ring.incoming", true),
+ new Setting("phone.ring.keypad", true),
new Setting("phone.vibration.incoming", true),
new Setting("ril.data.enabled", true),
+ new Setting("ril.data.apn", ""),
+ new Setting("ril.data.passwd", ""),
+ new Setting("ril.data.mmsc", ""),
+ new Setting("ril.data.mmsproxy", ""),
+ new Setting("ril.data.mmsport", 0),
+ new Setting("ril.data.roaming.enabled", false),
+ new Setting("ril.data.user", ""),
new Setting("ril.radio.disabled", false),
new Setting("screen.automatic-brightness", true),
new Setting("screen.brightness", 0.5),
+ new Setting("screen.timeout", 60),
new Setting("sms.ring.received", true),
new Setting("sms.vibration.received", true),
new Setting("ums.enabled", false),
new Setting("ums.mode", ""),
- new Setting("ril.data.roaming.enabled", false),
- new Setting("ril.data.apn", ""),
- new Setting("ril.data.user", ""),
- new Setting("ril.data.passwd", ""),
- new Setting("ril.data.mmsc", ""),
- new Setting("ril.data.mmsproxy", ""),
- new Setting("ril.data.mmsport", 0),
- new Setting("devtools.debugger.remote-enabled", false),
- new Setting("devtools.debugger.log", false),
- new Setting("devtools.debugger.remote-port", 6000),
- new Setting("devtools.debugger.force-local", true),
- new Setting("debug.debug.paint-flashing.enabled", false),
- new Setting("homescreen.wallpaper", "default.png"),
- new Setting("lockscreen.wallpaper", "default.png"),
- new Setting("keyboard.layout.english", true),
- new Setting("keyboard.layout.dvorak", false),
- new Setting("keyboard.layout.otherlatins", false),
- new Setting("keyboard.layout.cyrillic", false),
- new Setting("keyboard.layout.hebrew", false),
- new Setting("keyboard.layout.zhuyin", false),
- new Setting("keyboard.layout.pinyin", false),
- new Setting("keyboard.layout.arabic", false),
- new Setting("keyboard.layout.greek", false),
- new Setting("keyboard.layouts.japanese", false),
- new Setting("keyboard.layouts.portuguese", false),
- new Setting("keyboard.layouts.spanish", false),
- new Setting("screen.timeout", 60)
+ new Setting("wifi.notification", false),
];
// Ensure there is no duplicate

0 comments on commit 7cbb70a

Please sign in to comment.
Something went wrong with that request. Please try again.