Commit a2709dda6497879dd91beda2f6797c86e47d7bba

dBsooner's Stuff <dbsooner @del…ge.vision5.com>
Fri Jan 22 04:39:16 CET 2010

Tree SHA1: 2cae281
Parent SHA1: 1c3d8c1 (Fixed headers in 3 patches for Eric.)
raw diff | raw patch

5 new, 1 updated patches.

Diff rendering mode:
inline
side by side


		1	diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js
		2	index 965e167..a87dbc1 100644
		3	--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js
		4	+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/page-controls.js
		5	@@ -27,7 +27,7 @@ PageControls = Class.create({
		6	};
		7
		8	this._model = {
		9	- visible: true,
		10	+ visible: false,
		11	items: [this._backModel, {}, {}]
		12	};
		13
		14	@@ -63,7 +63,7 @@ PageControls = Class.create({
		15
		16	var items = $A();
		17	this._backModel.disabled = !back;
		18	- items.push(this._backModel);
		19	+ items.push(false);
		20
		21	if (forward) {
		22	this._forwardModel.disabled = !forward;
		23	@@ -73,7 +73,7 @@ PageControls = Class.create({
		24	}
		25
		26	// The spacer... right aligns the following button.
		27	- items.push({});
		28	+ items.push(false);
		29
		30	this._back = back;
		31	this._forward = forward;
		32	@@ -84,7 +84,7 @@ PageControls = Class.create({
		33	updateBackForward: function(back, forward) {
		34
		35	// Add the back/forward buttons
		36	- this._model.items = this._setBackForward(back, forward);
		37	+ this._model.items = this._setBackForward(false);
		38	// The spacer... right aligns the following button.
		39	this._model.items.push(this._currentPageModel);
		40
		41	@@ -107,11 +107,13 @@ PageControls = Class.create({
		42	}
		43
		44	// Add the back/forward buttons
		45	- this._model.items = this._setBackForward(this._back, this._forward);
		46	+ this._model.items = this._setBackForward(false);
		47	// The spacer... right aligns the following button.
		48	this._model.items.push(idleModel);
		49	this._controller.modelChanged(this._model);
		50
		51	+ this._controller.setMenuVisible(Mojo.Menu.commandMenu, false);
		52	+
		53	this._currentPageModel = idleModel;
		54	},
		55
		56	@@ -137,11 +139,13 @@ PageControls = Class.create({
		57	});
		58
		59	// Add the back/forward buttons
		60	- this._model.items = this._setBackForward(this._back, this._forward);
		61	+ this._model.items = this._setBackForward(false);
		62	this._model.items.push(progressModel);
		63	this._controller.modelChanged(this._model);
		64	this._animation.start(0);
		65
		66	+ this._controller.setMenuVisible(Mojo.Menu.commandMenu, true);
		67	+
		68	this._currentPageModel = progressModel;
		69
		70	} catch (e) {
		71	@@ -182,11 +186,13 @@ PageControls = Class.create({
		72	});
		73
		74	// Add the back/forward buttons
		75	- this._model.items = this._setBackForward(this._back, this._forward);
		76	+ this._model.items = this._setBackForward(false);
		77	this._model.items.push(searchModel);
		78	this._controller.modelChanged(this._model);
		79	this._animation.start();
		80
		81	+ this._controller.setMenuVisible(Mojo.Menu.commandMenu, true);
		82	+
		83	this._currentPageModel = searchModel;
		84
		85	} catch (e) {


1		--- .orig/usr/palm/applications/com.palm.app.browser/app/controllers/widget_webview.js
2		+++ /usr/palm/applications/com.palm.app.browser/app/controllers/widget_webview.js
3		@@ -465,7 +465,7 @@
4
5		reloadPage: function() {
6		if (this.useAdapter) {
7		- this.adapter.reloadPage();
8		+ this.adapter.reloadPage(false);
9		}
10		},
11
12		@@ -1542,7 +1542,7 @@
	1	diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/widget_webview.js b/usr/palm/applications/com.palm.app.browser/app/controllers/widget_webview.js
	2	index 6f1811c..d721d21 100644
	3	--- a/usr/palm/applications/com.palm.app.browser/app/controllers/widget_webview.js
	4	+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/widget_webview.js
	5	@@ -1542,7 +1542,7 @@ Mojo.Widget.WebView = Class.create({
13	6	}
14	7	else {
15	8	if (this._serverConnectTimer === undefined) {


		1	diff --git a/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js b/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		2	index 7f52bdd..9e13cb7 100644
		3	--- a/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		4	+++ b/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		5	@@ -246,7 +246,12 @@ var NotificationAssistant = Class.create({
		6	// priority and trumps all other sound types.
		7	if (folderObj.hasNew === true &&
		8	folderObj.playSound !== AccountpreferencesAssistant.kNotifyTypeNone &&
		9	- playSound !== AccountpreferencesAssistant.kNotifyTypeAudio) {
		10	+ playSound !== AccountpreferencesAssistant.kNotifyTypeAudio)
		11	+ this.serviceRequest = new Mojo.Service.Request
		12	+ ("palm://com.palm.vibrate", {
		13	+ method: 'vibrate', parameters: { 'period': 0,'duration': 1500 }
		14	+ });
		15	+{
		16
		17	playSound = folderObj.playSound;
		18	}


		1	diff --git a/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js b/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		2	index 7f52bdd..7be76d7 100644
		3	--- a/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		4	+++ b/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		5	@@ -246,7 +246,12 @@ var NotificationAssistant = Class.create({
		6	// priority and trumps all other sound types.
		7	if (folderObj.hasNew === true &&
		8	folderObj.playSound !== AccountpreferencesAssistant.kNotifyTypeNone &&
		9	- playSound !== AccountpreferencesAssistant.kNotifyTypeAudio) {
		10	+ playSound !== AccountpreferencesAssistant.kNotifyTypeAudio)
		11	+ this.serviceRequest = new Mojo.Service.Request
		12	+ ("palm://com.palm.vibrate", {
		13	+ method: 'vibrate', parameters: { 'period': 0,'duration': 1000 }
		14	+ });
		15	+{
		16
		17	playSound = folderObj.playSound;
		18	}


		1	diff --git a/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js b/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		2	index 7f52bdd..bc1c877 100644
		3	--- a/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		4	+++ b/usr/palm/applications/com.palm.app.email/app/controllers/notification-assistant.js
		5	@@ -246,7 +246,12 @@ var NotificationAssistant = Class.create({
		6	// priority and trumps all other sound types.
		7	if (folderObj.hasNew === true &&
		8	folderObj.playSound !== AccountpreferencesAssistant.kNotifyTypeNone &&
		9	- playSound !== AccountpreferencesAssistant.kNotifyTypeAudio) {
		10	+ playSound !== AccountpreferencesAssistant.kNotifyTypeAudio)
		11	+ this.serviceRequest = new Mojo.Service.Request
		12	+ ("palm://com.palm.vibrate", {
		13	+ method: 'vibrate', parameters: { 'period': 0,'duration': 2000 }
		14	+ });
		15	+{
		16
		17	playSound = folderObj.playSound;
		18	}


		1	diff --git a/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js b/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js
		2	index 86eb675..0683764 100644
		3	--- a/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js
		4	+++ b/usr/palm/applications/com.palm.app.screenlock/app/controllers/securityconfig-assistant.js
		5	@@ -19,6 +19,10 @@ var SecurityconfigAssistant = Class.create({
		6	enableProp: 'enabled',
		7	},
		8
		9	+ autoOffChargingtoggleModel: {
		10	+ value: false
		11	+ },
		12	+
		13	switchApptoggleModel: {
		14	value: false,
		15	},
		16	@@ -53,6 +57,9 @@ var SecurityconfigAssistant = Class.create({
		17	//this.controller.setupWidget('blinkAlerts', this.onOffToggleOpt, this.ledThrobberToggleModel);
		18	//Mojo.Event.listen($('blinkAlerts'),'mojo-property-change', this.toggleLEDThrobber.bindAsEventListener(this));
		19
		20	+ this.controller.setupWidget('autoOffCharging', this.onOffToggleOpt, this.autoOffChargingtoggleModel);
		21	+ Mojo.Event.listen($('autoOffCharging'),'mojo-property-change', this.toggleautoOffCharging.bindAsEventListener(this));
		22	+
		23	this.controller.setupWidget('switchApps', this.onOffToggleOpt, this.switchApptoggleModel);
		24	Mojo.Event.listen($('switchApps'),'mojo-property-change', this.toggleSwitchApps.bindAsEventListener(this));
		25
		26	@@ -236,6 +243,7 @@ var SecurityconfigAssistant = Class.create({
		27
		28	this.getSystemlockModeReq = SystemService.getSystemlockMode(this.handleSystemlockMode.bind(this));
		29	this.getSystemlockTimeoutReq = SystemService.getSystemlockTimeout(this.handleSystemlockTimeout.bind(this));
		30	+ this.getAutoOffCharging();
		31	},
		32
		33	updateUI: function(timeout,maximumBrightness) {
		34	@@ -551,6 +559,33 @@ var SecurityconfigAssistant = Class.create({
		35	}
		36	},
		37
		38	+ toggleautoOffCharging: function(event) {
		39	+ if(!event)
		40	+ return;
		41	+ this.setAutoOffCharging(event.value);
		42	+ },
		43	+
		44	+ setAutoOffCharging: function(value) {
		45	+ this.controller.serviceRequest('palm://com.palm.display/control', {
		46	+ method: 'setProperty',
		47	+ parameters: {
		48	+ onWhenConnected: !value
		49	+ }
		50	+ });
		51	+ },
		52	+
		53	+ getAutoOffCharging: function() {
		54	+ this.controller.serviceRequest('palm://com.palm.display/control', {
		55	+ method: 'getProperty',
		56	+ parameters: {
		57	+ properties: ["onWhenConnected"]
		58	+ },
		59	+ onSuccess: function(payload) {
		60	+ this.autoOffChargingToggleModel.value = !payload.onWhenConnected;
		61	+ this.controller.modelChanged(this.autoOffChargingtoggleModel);
		62	+ }.bind(this)
		63	+ });
		64	+ },
		65
		66
		67	launchFilePicker: function(event) {
		68	diff --git a/usr/palm/applications/com.palm.app.screenlock/app/views/securityconfig/securityconfig-scene.html b/usr/palm/applications/com.palm.app.screenlock/app/views/securityconfig/securityconfig-scene.html
		69	index a97b61b..ab92777 100644
		70	--- a/usr/palm/applications/com.palm.app.screenlock/app/views/securityconfig/securityconfig-scene.html
		71	+++ b/usr/palm/applications/com.palm.app.screenlock/app/views/securityconfig/securityconfig-scene.html
		72	@@ -19,11 +19,17 @@
		73	</div>
		74	</div>
		75
		76	- <div id='screentimerrow' class="palm-row last">
		77	+ <div id='screentimerrow' class="palm-row">
		78	<div id='timeroptions' class="palm-row-wrapper">
		79	<div id="screenOffTimer" x-mojo-element="ListSelector" class="right"></div>
		80	</div>
		81	</div>
		82	+ <div class="palm-row last">
		83	+ <div class="palm-row-wrapper">
		84	+ <div x-mojo-element="ToggleButton" id="autoOffCharging"></div>
		85	+ <div class="title capitalize" style="font-size:0.85em" x-mojo-loc=''>Auto-off while charging</div>
		86	+ </div>
		87	+ </div>
		88	</div>
		89	</div>
		90	<div class="palm-group">

Commit a2709dda6497879dd91beda2f6797c86e47d7bba

Gitorious