Skip to content

Commit

Permalink
updates and addition
Browse files Browse the repository at this point in the history
  • Loading branch information
www-data committed Sep 12, 2011
1 parent 34faed6 commit 789bc8f
Showing 1 changed file with 138 additions and 0 deletions.
138 changes: 138 additions & 0 deletions browser/browser-add-thumbnav-controls.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
diff --git a/usr/palm/applications/com.palm.app.browser/css/browser.css b/usr/palm/applications/com.palm.app.browser/css/browser.css
index b2734ba..c1c46de 100644
--- a/usr/palm/applications/com.palm.app.browser/css/browser.css
+++ b/usr/palm/applications/com.palm.app.browser/css/browser.css
@@ -1,3 +1,28 @@
+.gestureBar {
+ width: 7px;
+ height: 1024px;
+ background: #000;
+}
+.navBar {
+ width: 55px;
+ background: rgba(0,0,0,.7);
+ padding: 5px 10px 5px 5px;
+ margin: 0px;
+ min-width: 10px;
+ -webkit-box-sizing: border-box;
+ border-width: 0px;
+ -webkit-border-image: url(../images/popup.png) 0 0 0 0 stretch stretch;
+}
+.navBarButton {
+
+}
+.basic-back {
+ background: #000000;
+}
+.actionbar {
+ margin-right: 7px;
+}
+
/* Start Page */

.startpage-list .enyo-datalist-client {
diff --git a/usr/palm/applications/com.palm.app.browser/source/Browser.js b/usr/palm/applications/com.palm.app.browser/source/Browser.js
index f2d5a46..b871b0b 100644
--- a/usr/palm/applications/com.palm.app.browser/source/Browser.js
+++ b/usr/palm/applications/com.palm.app.browser/source/Browser.js
@@ -36,26 +36,30 @@ enyo.kind({
onOpenBookmarks: "doOpenBookmarks",
onNewCard: "openNewCard"
},
- {name: "view", kind: window.PalmSystem ? "WebView" : "Iframe", flex: 1,
- onMousehold: "openContextMenu",
- onPageTitleChanged: "pageTitleChanged",
- onUrlRedirected: "doUrlRedirected",
- onLoadStarted: "loadStarted",
- onLoadProgress: "loadProgress",
- onLoadStopped: "loadStopped",
- onLoadComplete: "loadCompleted",
- onFileLoad: "doFileLoad",
- onError: "browserError",
- onSingleTap: "browserTap",
- onAlertDialog: "showAlertDialog",
- onConfirmDialog: "showConfirmDialog",
- onPromptDialog: "showPromptDialog",
- onSSLConfirmDialog: "showSSLConfirmDialog",
- onUserPasswordDialog: "showUserPasswordDialog",
- onNewPage: "openNewCardWithIdentifier",
- onPrint: "doPrint",
- minFontSize: 2,
- },
+ {kind: "HFlexBox", flex:1, components: [
+ //{kind: "Control", className: "gestureBar", onmousedown: "openNavBar"},
+ {name: "view", kind: window.PalmSystem ? "WebView" : "Iframe", flex: 1,
+ onMousehold: "openContextMenu",
+ onPageTitleChanged: "pageTitleChanged",
+ onUrlRedirected: "doUrlRedirected",
+ onLoadStarted: "loadStarted",
+ onLoadProgress: "loadProgress",
+ onLoadStopped: "loadStopped",
+ onLoadComplete: "loadCompleted",
+ onFileLoad: "doFileLoad",
+ onError: "browserError",
+ onSingleTap: "browserTap",
+ onAlertDialog: "showAlertDialog",
+ onConfirmDialog: "showConfirmDialog",
+ onPromptDialog: "showPromptDialog",
+ onSSLConfirmDialog: "showSSLConfirmDialog",
+ onUserPasswordDialog: "showUserPasswordDialog",
+ onNewPage: "openNewCardWithIdentifier",
+ onPrint: "doPrint",
+ minFontSize: 2,
+ },
+ {kind: "Control", className: "gestureBar", onmousedown: "openNavBar"}
+ ]},
{kind: "FindBar", showing: false, onFind: "find", onGoToPrevious: "goToPrevious", onGoToNext: "goToNext"},
{name: "context", kind: "BrowserContextMenu", onItemClick: "contextItemClick"},
{name: "dialog", kind: "VerticalAcceptCancelPopup", cancelCaption: "", components: [
@@ -84,7 +88,15 @@ enyo.kind({
{kind: "Button", flex: 1, caption: $L("Trust Once"), response: "2", onclick: "closeSSLConfirmBox"},
{kind: "Button", flex: 1, caption: $L("Don't Trust"), response: "0", onclick: "closeSSLConfirmBox"}
]}
- ]}
+ ]},
+ {name: "navBar", kind: "Popup", className: "navBar", components: [
+ {kind: "ToolButton", name: "back", className: "actionbar-tool-button", icon: "images/chrome/menu-icon-back.png", onclick: "nbBack"},
+ {kind: "ToolButton", name: "forward", className: "actionbar-tool-button", icon: "images/chrome/menu-icon-forward.png", onclick: "nbForward"},
+ {kind: "ToolButton", name: "search", className: "actionbar-tool-button", icon: "images/chrome/menu-icon-refresh.png", onclick: "nbRefresh"},
+ //{kind: "ToolButton", name: "share", className: "actionbar-tool-button", icon: "images/chrome/menu-icon-share.png", onclick: "nbShare"},
+ {kind: "ToolButton", className: "actionbar-tool-button", icon: "images/chrome/menu-icon-newcard.png", onclick: "nbNewCard"},
+ {kind: "ToolButton", className: "actionbar-tool-button", icon: "images/chrome/menu-icon-bookmark.png", onclick: "nbOpenBookmarks"},
+ ]},
],
WebKitErrors: {
ERR_SYS_FILE_DOESNT_EXIST: 14,
@@ -104,6 +116,32 @@ enyo.kind({
this.$.view.setIdentifier(enyo.windowParams.webviewId);
}
},
+ openNavBar: function(inSender, inEvent) {
+ this.$.navBar.openAtEvent(inEvent, {top: -100});
+ },
+ nbBack: function() {
+ this.goBack();
+ this.$.navBar.close();
+ },
+ nbForward: function() {
+ this.goForward();
+ this.$.navBar.close();
+ },
+ nbRefresh: function() {
+ this.reloadClick();
+ this.$.navBar.close();
+ },
+ /*nbShare: function() {
+
+ },*/
+ nbNewCard: function() {
+ this.openNewCard();
+ this.$.navBar.close();
+ },
+ nbOpenBookmarks: function() {
+ this.doOpenBookmarks();
+ this.$.navBar.close();
+ },
resize: function() {
this.$.actionbar.resize();
this.$.view.resize();

0 comments on commit 789bc8f

Please sign in to comment.