Commit 2df512b018fe0995ed56ca04c79efd6008cdafe2

  • avatar
  • egaudet
  • Sun Oct 04 10:34:05 CEST 2009
Fix patches that I generated poorly, and lost functionality.
browser/enable-browser-downloads.patch
(66 / 0)
  
4242 };
4343
4444 Chrome.prototype.isVisible = function() {
45diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js b/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js
46new file mode 100644
47index 0000000..4c07986
48--- /dev/null
49+++ b/usr/palm/applications/com.palm.app.browser/app/controllers/downloaddialog-assistant.js
50@@ -0,0 +1,46 @@
51+/**
52+ * A dialog assistant for display of yes/no box.
53+ */
54+DownloadDialogAssistant = Class.create({
55+
56+ initialize: function(params) {
57+ this.onDismiss = params.onDismiss;
58+ this.onAccept = params.onAccept;
59+ this.controller= params.sceneAssistant.controller;
60+
61+ // Button handlers.
62+ this.onDismissHandler = this.handleDismiss.bindAsEventListener(this);
63+ this.onAcceptHandler = this.handleAccept.bindAsEventListener(this);
64+ },
65+
66+ setup: function(widget) {
67+ this.widget = widget;
68+ this.controller.get('acceptButton').addEventListener(Mojo.Event.tap, this.onAcceptHandler);
69+ this.controller.get('acceptButton').focus();
70+ this.controller.get('dismissButton').addEventListener(Mojo.Event.tap, this.onDismissHandler);
71+ this.controller.get('dismissButton').focus();
72+ },
73+
74+ handleDismiss: function() {
75+ this.onDismiss();
76+ delete this.onDismiss;
77+ this.widget.mojo.close();
78+ },
79+ handleAccept: function() {
80+ this.onAccept();
81+ delete this.onAccept;
82+ delete this.onDismiss;
83+ this.widget.mojo.close();
84+ },
85+
86+ cleanup: function() {
87+ Mojo.Log.info("NetworkDialogAssistant#cleanup()");
88+ Mojo.Event.stopListening(this.controller.get('dismissButton'), Mojo.Event.tap, this.onDismissHandler);
89+ Mojo.Event.stopListening(this.controller.get('acceptButton'), Mojo.Event.tap, this.onAcceptHandler);
90+
91+ // Send a dismiss if NOT already sent a response
92+ if (this.onDismiss) {
93+ this.onDismiss();
94+ }
95+ }
96+});
4597diff --git a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js b/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js
4698index a805d2c..1074480 100644
4799--- a/usr/palm/applications/com.palm.app.browser/app/controllers/page-assistant.js
……
313313 };
314314
315315 UrlBar.prototype.isVisible = function() {
316diff --git a/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html b/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html
317new file mode 100644
318index 0000000..b705ece
319--- /dev/null
320+++ b/usr/palm/applications/com.palm.app.browser/app/views/download/download-stream-popup.html
321@@ -0,0 +1,8 @@
322+<div id="palm-dialog-content" class="palm-dialog-content">
323+ <div class="dialog-message" x-mojo-loc="">This file type has been registered as a streaming media file. Would you like to download it to /media/internal/downloads instead?</div>
324+</div>
325+
326+<div class="palm-dialog-buttons">
327+ <div class="dismiss palm-button" id="acceptButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Stream</div>
328+ <div class="dismiss palm-button" id="dismissButton" x-mojo-loc="" x-mojo-tap-highlight="momentary">Download</div>
329+</div>
316330diff --git a/usr/palm/applications/com.palm.app.browser/sources.json b/usr/palm/applications/com.palm.app.browser/sources.json
317331index 54187ce..7d79e70 100644
318332--- a/usr/palm/applications/com.palm.app.browser/sources.json
luna/battery-percent.patch
(28 / 1)
  
11diff --git a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js
2index ee479ac..6f21c54 100644
2index ee479ac..0618d89 100644
33--- a/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js
44+++ b/usr/lib/luna/system/luna-systemui/app/controllers/bar-assistant.js
55@@ -1430,10 +1430,49 @@ closePbapAlert: function() {
……
136136 Mojo.Controller.getAppController().removeBanner('chargingAlert');
137137 }
138138 }
139diff --git a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
140index 58b22e8..b23eab5 100644
141--- a/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
142+++ b/usr/lib/luna/system/luna-systemui/stylesheets/systemui.css
143@@ -136,6 +136,22 @@ body.palm-default {
144 margin-left: 2px;
145 width: 17px;
146 }
147+
148+/* Begin: Battery Percent / Image w/ Percent */
149+#power.battery-percent {
150+ width: 38px;
151+ background-color: black;
152+}
153+#power.battery-percentimage {
154+ width: 49px;
155+ background-color: black;
156+}
157+#power.battery-percentimage-charged {
158+ width: 49px;
159+ background-color: black;
160+}
161+/* End: Battery Percent / Image w/ Percent */
162+
163 #power.error {
164 background: url(../images/battery-error.png) center center no-repeat;
165 }