From 30ae66ac14ffb62a9d06b5aa7bc602dab45f6c04 Mon Sep 17 00:00:00 2001 From: "mfinkle@mozilla.com" Date: Fri, 18 Apr 2008 13:41:49 +0000 Subject: [PATCH 0001/2836] buildable mobile browser --HG-- branch : mobile extra : convert_revision : svn%3A4eb1ac78-321c-0410-a911-ec516a8615a5/projects/fennec/mobile%4012383 --- mobile/Makefile.in | 47 + mobile/app/Makefile.in | 98 ++ mobile/app/application.ini | 15 + mobile/app/mobile.js | 121 ++ mobile/build.mk | 57 + mobile/chrome/Makefile.in | 47 + mobile/chrome/content/browser.js | 1034 +++++++++++++++++ mobile/chrome/content/browser.xul | 189 +++ mobile/chrome/content/commandUtil.js | 197 ++++ mobile/chrome/content/content.css | 42 + mobile/chrome/content/deckbrowser.css | 7 + mobile/chrome/content/deckbrowser.xml | 248 ++++ mobile/chrome/content/scrollbars.css | 55 + mobile/chrome/jar.mn | 35 + mobile/chrome/locale/en-US/brand/brand.dtd | 2 + .../locale/en-US/brand/brand.properties | 2 + mobile/chrome/locale/en-US/browser.dtd | 38 + mobile/chrome/skin/browser.css | 275 +++++ mobile/chrome/skin/images/bookmarks.png | Bin 0 -> 508 bytes mobile/chrome/skin/images/close.png | Bin 0 -> 1894 bytes mobile/chrome/skin/images/default-favicon.png | Bin 0 -> 733 bytes mobile/chrome/skin/images/go-arrow.png | Bin 0 -> 573 bytes mobile/chrome/skin/images/page-starred.png | Bin 0 -> 718 bytes mobile/chrome/skin/images/search-glass.png | Bin 0 -> 862 bytes mobile/chrome/skin/images/star-page.png | Bin 0 -> 718 bytes mobile/chrome/skin/images/starred48.png | Bin 0 -> 1911 bytes mobile/chrome/skin/images/tap-n-hold.png | Bin 0 -> 3265 bytes mobile/chrome/skin/images/throbber.gif | Bin 0 -> 825 bytes mobile/chrome/skin/images/throbber.png | Bin 0 -> 214 bytes mobile/chrome/skin/images/toolbar.png | Bin 0 -> 19631 bytes mobile/confvars.sh | 46 + mobile/installer/Makefile.in | 66 ++ mobile/makefiles.sh | 45 + 33 files changed, 2666 insertions(+) create mode 100644 mobile/Makefile.in create mode 100644 mobile/app/Makefile.in create mode 100644 mobile/app/application.ini create mode 100644 mobile/app/mobile.js create mode 100644 mobile/build.mk create mode 100644 mobile/chrome/Makefile.in create mode 100644 mobile/chrome/content/browser.js create mode 100644 mobile/chrome/content/browser.xul create mode 100644 mobile/chrome/content/commandUtil.js create mode 100644 mobile/chrome/content/content.css create mode 100644 mobile/chrome/content/deckbrowser.css create mode 100644 mobile/chrome/content/deckbrowser.xml create mode 100644 mobile/chrome/content/scrollbars.css create mode 100644 mobile/chrome/jar.mn create mode 100644 mobile/chrome/locale/en-US/brand/brand.dtd create mode 100644 mobile/chrome/locale/en-US/brand/brand.properties create mode 100644 mobile/chrome/locale/en-US/browser.dtd create mode 100644 mobile/chrome/skin/browser.css create mode 100644 mobile/chrome/skin/images/bookmarks.png create mode 100644 mobile/chrome/skin/images/close.png create mode 100644 mobile/chrome/skin/images/default-favicon.png create mode 100644 mobile/chrome/skin/images/go-arrow.png create mode 100644 mobile/chrome/skin/images/page-starred.png create mode 100644 mobile/chrome/skin/images/search-glass.png create mode 100644 mobile/chrome/skin/images/star-page.png create mode 100644 mobile/chrome/skin/images/starred48.png create mode 100644 mobile/chrome/skin/images/tap-n-hold.png create mode 100644 mobile/chrome/skin/images/throbber.gif create mode 100644 mobile/chrome/skin/images/throbber.png create mode 100644 mobile/chrome/skin/images/toolbar.png create mode 100644 mobile/confvars.sh create mode 100644 mobile/installer/Makefile.in create mode 100644 mobile/makefiles.sh diff --git a/mobile/Makefile.in b/mobile/Makefile.in new file mode 100644 index 00000000000..251ed940cf2 --- /dev/null +++ b/mobile/Makefile.in @@ -0,0 +1,47 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla. +# +# The Initial Developer of the Original Code is +# the Mozilla Foundation . +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Mark Finkle +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = .. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +DIRS = chrome app + +include $(topsrcdir)/config/rules.mk diff --git a/mobile/app/Makefile.in b/mobile/app/Makefile.in new file mode 100644 index 00000000000..b7d53e57b20 --- /dev/null +++ b/mobile/app/Makefile.in @@ -0,0 +1,98 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla. +# +# The Initial Developer of the Original Code is +# the Mozilla Foundation . +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Mark Finkle +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +PREF_JS_EXPORTS = $(srcdir)/mobile.js +DIST_FILES = application.ini + +include $(topsrcdir)/config/rules.mk + +GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone) +GRE_BUILDID = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID) +APP_UA_NAME = $(shell echo $(MOZ_APP_DISPLAYNAME) | sed -e's/[^A-Za-z]//g') + +DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID) -DAPP_NAME=$(MOZ_APP_DISPLAYNAME) -DAPP_VERSION=$(MOZ_APP_VERSION) -DAPP_UA_NAME=$(APP_UA_NAME) + +APP_BINARY = $(MOZ_APP_NAME)$(BIN_SUFFIX) + +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + +APP_NAME = $(MOZ_APP_DISPLAYNAME) +APP_VERSION = $(MOZ_APP_VERSION) + +ifdef MOZ_DEBUG +APP_NAME := $(APP_NAME)Debug +endif + +AB_CD = $(MOZ_UI_LOCALE) + +AB := $(firstword $(subst -, ,$(AB_CD))) + +clean clobber repackage:: + rm -rf $(DIST)/$(APP_NAME).app + +APPFILES = Resources + +libs repackage:: application.ini + mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS + rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents $(DIST)/$(APP_NAME).app --exclude English.lproj + mkdir -p $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj + rsync -a --exclude CVS --exclude "*.in" $(srcdir)/macbuild/Contents/Resources/English.lproj/ $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj + sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" -e "s/%APP_BINARY%/$(APP_BINARY)/" $(srcdir)/macbuild/Contents/Info.plist.in > $(DIST)/$(APP_NAME).app/Contents/Info.plist + sed -e "s/%APP_VERSION%/$(APP_VERSION)/" -e "s/%APP_NAME%/$(APP_NAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | iconv -f UTF-8 -t UTF-16 > $(DIST)/$(APP_NAME).app/Contents/Resources/$(AB).lproj/InfoPlist.strings + rsync -a $(DIST)/bin/ $(DIST)/$(APP_NAME).app/Contents/$(APPFILES) + $(RM) $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/mangle $(DIST)/$(APP_NAME).app/Contents/$(APPFILES)/shlibsign + cp $(LIBXUL_DIST)/bin/xulrunner$(BIN_SUFFIX) $(DIST)/$(APP_NAME).app/Contents/MacOS/$(APP_BINARY) + rsync -a --exclude nsinstall --copy-unsafe-links $(LIBXUL_DIST)/XUL.framework $(DIST)/$(APP_NAME).app/Contents/Frameworks + echo -n APPLMOZB > $(DIST)/$(APP_NAME).app/Contents/PkgInfo +# remove CVS dirs from packaged app + find $(DIST)/$(APP_NAME).app -type d -name "CVS" -prune -exec rm -rf {} \; + +else + +libs:: + cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/$(APP_BINARY) + $(NSINSTALL) -D $(DIST)/bin/xulrunner + (cd $(LIBXUL_SDK)/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DIST)/bin/xulrunner && tar -xf -) + +endif diff --git a/mobile/app/application.ini b/mobile/app/application.ini new file mode 100644 index 00000000000..9f83ad2efc5 --- /dev/null +++ b/mobile/app/application.ini @@ -0,0 +1,15 @@ +#filter substitution +[App] +Vendor=Mozilla +Name=@APP_NAME@ +Version=@APP_VERSION@ +BuildID=@GRE_BUILDID@ +Copyright=Copyright (c) 2008 Mozilla.org +ID={a23983c0-fd0e-11dc-95ff-0800200c9a66} + +[Gecko] +MinVersion=@GRE_MILESTONE@ +MaxVersion=@GRE_MILESTONE@ + +[XRE] +EnableExtensionManager=1 diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js new file mode 100644 index 00000000000..98e6efcbff9 --- /dev/null +++ b/mobile/app/mobile.js @@ -0,0 +1,121 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Mobile Browser. + * + * The Initial Developer of the Original Code is + * Mozilla Corporation. + * Portions created by the Initial Developer are Copyright (C) 2008 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#filter substitution + +pref("toolkit.defaultChromeURI", "chrome://browser/content/browser.xul"); +pref("general.useragent.extra.mobile", "@APP_UA_NAME@/@APP_VERSION@"); + +pref("browser.startup.homepage", "http://www.mozilla.org/"); +pref("browser.ui.cursor", false); +pref("general.smoothScroll", false); + +/* cache prefs */ +pref("browser.cache.disk.enable", false); +pref("browser.cache.disk.capacity", 0); +pref("browser.cache.memory.enable", true); +pref("browser.cache.memory.capacity", 1024); + +/* http prefs */ +pref("network.http.pipelining", true); +pref("network.http.pipelining.ssl", true); +pref("network.http.proxy.pipelining", true); +pref("network.http.pipelining.maxrequests" , 2); +pref("network.http.keep-alive.timeout", 600); +pref("network.http.max-connections", 4); +pref("network.http.max-connections-per-server", 1); +pref("network.http.max-persistent-connections-per-server", 1); +pref("network.http.max-persistent-connections-per-proxy", 1); + +/* session history */ +pref("browser.sessionhistory.max_total_viewers", 0); +pref("browser.sessionhistory.max_entries", 3); + +/* debugging prefs */ +pref("browser.dom.window.dump.enabled", true); +pref("javascript.options.showInConsole", true); +pref("javascript.options.strict", true); +pref("nglayout.debug.disable_xul_cache", false); +pref("nglayout.debug.disable_xul_fastload", false); + +/* download manager */ +pref("browser.download.useDownloadDir", true); +pref("browser.download.folderList", 0); +pref("browser.download.manager.showAlertOnComplete", true); +pref("browser.download.manager.showAlertInterval", 2000); +pref("browser.download.manager.retention", 2); +pref("browser.download.manager.showWhenStarting", true); +pref("browser.download.manager.useWindow", true); +pref("browser.download.manager.closeWhenDone", true); +pref("browser.download.manager.openDelay", 0); +pref("browser.download.manager.focusWhenStarting", false); +pref("browser.download.manager.flashCount", 2); +pref("browser.download.manager.displayedHistoryDays", 7); + +/* download alerts */ +pref("alerts.slideIncrement", 1); +pref("alerts.slideIncrementTime", 10); +pref("alerts.totalOpenTime", 6000); +pref("alerts.height", 50); + +/* password manager */ +pref("signon.rememberSignons", true); +pref("signon.expireMasterPassword", false); +pref("signon.SignonFileName", "signons.txt"); + +/* autocomplete */ +pref("browser.formfill.enable", true); + +/* spellcheck */ +pref("layout.spellcheckDefault", 1); + +/* extension manager and xpinstall */ +pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); +pref("xpinstall.dialog.progress.skin", "chrome://mozapps/content/extensions/extensions.xul?type=themes"); +pref("xpinstall.dialog.progress.chrome", "chrome://mozapps/content/extensions/extensions.xul?type=extensions"); +pref("xpinstall.dialog.progress.type.skin", "Extension:Manager-themes"); +pref("xpinstall.dialog.progress.type.chrome", "Extension:Manager-extensions"); +pref("extensions.update.enabled", true); +pref("extensions.update.interval", 86400); +pref("extensions.dss.enabled", false); +pref("extensions.dss.switchPending", false); +pref("extensions.ignoreMTimeChanges", false); +pref("extensions.logging.enabled", false); + +/* these point at AMO */ +pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties"); +pref("extensions.getMoreExtensionsURL", "chrome://mozapps/locale/extensions/extensions.properties"); +pref("extensions.getMoreThemesURL", "chrome://mozapps/locale/extensions/extensions.properties"); diff --git a/mobile/build.mk b/mobile/build.mk new file mode 100644 index 00000000000..2fc5a09b750 --- /dev/null +++ b/mobile/build.mk @@ -0,0 +1,57 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla. +# +# The Initial Developer of the Original Code is +# the Mozilla Foundation . +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Mark Finkle +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +TIERS += app + +ifdef MOZ_EXTENSIONS +tier_app_dirs += extensions +endif + +tier_app_dirs += \ + mobile \ + $(NULL) + +installer: + @echo "Mobile doesn't have an installer yet." + @exit 1 + +package: + @$(MAKE) -C mobile/installer + +install:: + @echo "Mobile can't be installed directly." + @exit 1 diff --git a/mobile/chrome/Makefile.in b/mobile/chrome/Makefile.in new file mode 100644 index 00000000000..f7a105ce366 --- /dev/null +++ b/mobile/chrome/Makefile.in @@ -0,0 +1,47 @@ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is Mozilla. +# +# The Initial Developer of the Original Code is +# the Mozilla Foundation . +# Portions created by the Initial Developer are Copyright (C) 2007 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Mark Finkle +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +DEFINES += -DAB_CD=$(MOZ_UI_LOCALE) -DPACKAGE=browser + +include $(topsrcdir)/config/rules.mk diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js new file mode 100644 index 00000000000..47757f8954b --- /dev/null +++ b/mobile/chrome/content/browser.js @@ -0,0 +1,1034 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Mozilla Mobile Browser. + * + * The Initial Developer of the Original Code is + * Mozilla Corporation. + * Portions created by the Initial Developer are Copyright (C) 2008 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Brad Lassey + * Mark Finkle + * Aleks Totic + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +const Cc = Components.classes; +const Ci = Components.interfaces; + +const TOOLBARSTATE_LOADING = 1; +const TOOLBARSTATE_LOADED = 2; +const TOOLBARSTATE_TYPING = 3; +const TOOLBARSTATE_INDETERMINATE = 4; + +var LocationBar = { + _urlbar : null, + _throbber : null, + _favicon : null, + _faviconAdded : false, + + _linkAdded : function(aEvent) { + var link = aEvent.originalTarget; + var rel = link.rel && link.rel.toLowerCase(); + if (!link || !link.ownerDocument || !rel || !link.href) + return; + + var rels = rel.split(/\s+/); + if (rels.indexOf("icon") != -1) { + this._favicon.setAttribute("src", link.href); + this._throbber.setAttribute("src", ""); + this._faviconAdded = true; + } + }, + + init : function() { + this._urlbar = document.getElementById("urlbar"); + this._urlbar.addEventListener("focus", this, false); + this._urlbar.addEventListener("input", this, false); + + this._throbber = document.getElementById("urlbar-throbber"); + this._favicon = document.getElementById("urlbar-favicon"); + this._favicon.addEventListener("error", this, false); + + Browser.content.addEventListener("DOMLinkAdded", this, true); + }, + + update : function(aState) { + var go = document.getElementById("cmd_go"); + var search = document.getElementById("cmd_search"); + var reload = document.getElementById("cmd_reload"); + var stop = document.getElementById("cmd_stop"); + + if (aState == TOOLBARSTATE_INDETERMINATE) { + this._faviconAdded = false; + aState = TOOLBARSTATE_LOADED; + this.setURI(); + } + + if (aState == TOOLBARSTATE_LOADING) { + go.collapsed = true; + search.collapsed = true; + reload.collapsed = true; + stop.collapsed = false; + + this._throbber.setAttribute("src", "chrome://browser/skin/images/throbber.gif"); + this._favicon.setAttribute("src", ""); + this._faviconAdded = false; + } + else if (aState == TOOLBARSTATE_LOADED) { + go.collapsed = true; + search.collapsed = true; + reload.collapsed = false; + stop.collapsed = true; + + this._throbber.setAttribute("src", ""); + if (this._faviconAdded == false) { + var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); + var faviconURI = ios.newURI(Browser.content.browser.currentURI.prePath + "/favicon.ico", null, null); + + var fis = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService); + if (fis.isFailedFavicon(faviconURI)) + faviconURI = ios.newURI("chrome://browser/skin/images/default-favicon.png", null, null); + + this._favicon.setAttribute("src", faviconURI.spec); + this._faviconAdded = true; + } + } + else if (aState == TOOLBARSTATE_TYPING) { + reload.collapsed = true; + stop.collapsed = true; + go.collapsed = false; + search.collapsed = false; + + this._throbber.setAttribute("src", "chrome://browser/skin/images/throbber.png"); + this._favicon.setAttribute("src", ""); + } + }, + + /* Set the location to the current content */ + setURI : function() { + // Update UI for history + var browser = Browser.content.browser; + var back = document.getElementById("cmd_back"); + var forward = document.getElementById("cmd_forward"); + + back.setAttribute("disabled", !browser.canGoBack); + forward.setAttribute("disabled", !browser.canGoForward); + + // Check for a bookmarked page + var star = document.getElementById("tool_star"); + star.removeAttribute("starred"); + var bms = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].getService(Ci.nsINavBookmarksService); + var bookmarks = bms.getBookmarkIdsForURI(browser.currentURI, {}); + if (bookmarks.length > 0) { + star.setAttribute("starred", "true"); + } + + var uri = browser.currentURI.spec; + if (uri == "about:blank") { + uri = ""; + this._urlbar.focus(); + } + + this._urlbar.value = uri; + }, + + revertURI : function() { + // Reset the current URI from the browser if the histroy list is not open + if (this._urlbar.popupOpen == false) + this.setURI(); + + // If the value isn't empty and the urlbar has focus, select the value. + if (this._urlbar.value && this._urlbar.hasAttribute("focused")) + this._urlbar.select(); + + return (this._urlbar.popupOpen == false); + }, + + goToURI : function() { + Browser.content.loadURI(this._urlbar.value, null, null, false); + }, + + search : function() { + var queryURI = "http://www.google.com/search?q=" + this._urlbar.value + "&hl=en&lr=&btnG=Search"; + Browser.content.loadURI(queryURI, null, null, false); + }, + + getURLBar : function() { + return this._urlbar; + }, + + handleEvent: function (aEvent) { + switch (aEvent.type) { + case "DOMLinkAdded": + this._linkAdded(aEvent); + break; + case "focus": + setTimeout(function() { aEvent.target.select(); }, 0); + break; + case "input": + this.update(TOOLBARSTATE_TYPING); + break; + case "error": + this._favicon.setAttribute("src", "chrome://browser/skin/images/default-favicon.png"); + break; + } + } +}; + + +var Bookmarks = { + bookmarks : null, + panel : null, + item : null, + + edit : function(aURI) { + this.bookmarks = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].getService(Ci.nsINavBookmarksService); + this.panel = document.getElementById("bookmark_edit"); + this.panel.hidden = false; // was initially hidden to reduce Ts + + var bookmarkIDs = this.bookmarks.getBookmarkIdsForURI(aURI, {}); + if (bookmarkIDs.length > 0) { + this.item = bookmarkIDs[0]; + document.getElementById("bookmark_url").value = aURI.spec; + document.getElementById("bookmark_name").value = this.bookmarks.getItemTitle(this.item); + + this.panel.openPopup(document.getElementById("tool_star"), "after_end", 0, 0, false, false); + } + }, + + remove : function() { + if (this.item) { + this.bookmarks.removeItem(this.item); + document.getElementById("tool_star").removeAttribute("starred"); + } + this.close(); + }, + + save : function() { + if (this.panel && this.item) { + var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); + var bookmarkURI = ios.newURI(document.getElementById("bookmark_url").value, null, null); + if (bookmarkURI) { + this.bookmarks.setItemTitle(this.item, document.getElementById("bookmark_name").value); + this.bookmarks.changeBookmarkURI(this.item, bookmarkURI); + } + } + this.close(); + }, + + close : function() { + if (this.panel) { + this.item = null; + this.panel.hidePopup(); + this.panel = null; + } + }, + + list : function() { + this.bookmarks = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].getService(Ci.nsINavBookmarksService); + this.panel = document.getElementById("bookmark_picker"); + this.panel.hidden = false; // was initially hidden to reduce Ts + + var list = document.getElementById("bookmark_list"); + while (list.childNodes.length > 0) { + list.removeChild(list.childNodes[0]); + } + + var fis = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService); + + var items = this.getBookmarks(); + if (items.length > 0) { + for (var i=0; i 0); + } + } + }, + + startup : function() { + this.prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch2); + + window.controllers.appendController(this); + + var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); + var styleSheets = Cc["@mozilla.org/content/style-sheet-service;1"].getService(Ci.nsIStyleSheetService); + + // Should we hide the cursors + var hideCursor = this.prefs.getBoolPref("browser.ui.cursor") == false; + if (hideCursor) { + window.QueryInterface(Ci.nsIDOMChromeWindow).setCursor("none"); + + var styleURI = ios.newURI("chrome://browser/content/content.css", null, null); + styleSheets.loadAndRegisterSheet(styleURI, styleSheets.AGENT_SHEET); + } + + // load styles for scrollbars + var styleURI = ios.newURI("chrome://browser/content/scrollbars.css", null, null); + styleSheets.loadAndRegisterSheet(styleURI, styleSheets.AGENT_SHEET); + + this._content = document.getElementById("content"); + this._content.addEventListener("DOMTitleChanged", this, true); + this._content.addEventListener("TabOpen", this, true); + this._content.addEventListener("TabClose", this, true); + this._content.addEventListener("TabSelect", this, true); + document.getElementById("popup_content").addEventListener("popupshowing", this, false); + + this._content.addBrowser("about:blank", null, null, false); + + LocationBar.init(); + Cc["@mozilla.org/login-manager;1"].getService(Ci.nsILoginManager); + + // Determine the initial launch page + var whereURI = null; + try { + // Use a homepage + whereURI = this.prefs.getCharPref("browser.startup.homepage"); + } + catch (e) { + } + + // Use a commandline parameter + if (window.arguments && window.arguments[0]) { + var cmdLine = window.arguments[0].QueryInterface(Ci.nsICommandLine); + if (cmdLine.length == 1) { + whereURI = cmdLine.resolveURI(cmdLine.getArgument(0)); + if (whereURI) + whereURI = whereURI.spec; + } + } + + if (whereURI) { + var self = this; + setTimeout(function() { self.content.browser.loadURI(whereURI, null, null, false); }, 10); + } + }, + + get content() { + return this._content; + }, + + handleEvent: function (aEvent) { + switch (aEvent.type) { + case "DOMTitleChanged": + this._titleChanged(aEvent); + break; + case "TabOpen": + this._tabOpen(aEvent); + break; + case "TabClose": + this._tabClose(aEvent); + break; + case "TabSelect": + this._tabSelect(aEvent); + break; + case "popupshowing": + this._popupShowing(aEvent); + break; + } + }, + + supportsCommand : function(cmd) { + var isSupported = false; + switch (cmd) { + case "cmd_back": + case "cmd_forward": + case "cmd_reload": + case "cmd_stop": + case "cmd_search": + case "cmd_go": + case "cmd_star": + case "cmd_bookmarks": + case "cmd_newTab": + case "cmd_closeTab": + case "cmd_switchTab": + case "cmd_menu": + case "cmd_fullscreen": + case "cmd_addons": + case "cmd_downloads": + isSupported = true; + break; + default: + isSupported = false; + break; + } + return isSupported; + }, + + isCommandEnabled : function(cmd) { + return true; + }, + + doCommand : function(cmd) { + var browser = this.content.browser; + + switch (cmd) { + case "cmd_back": + browser.stop(); + browser.goBack(); + break; + case "cmd_forward": + browser.stop(); + browser.goForward(); + break; + case "cmd_reload": + browser.reload(); + break; + case "cmd_stop": + browser.stop(); + break; + case "cmd_search": + { + LocationBar.search(); + break; + } + case "cmd_go": + { + LocationBar.goToURI(); + break; + } + case "cmd_star": + { + var bookmarkURI = browser.currentURI; + var bookmarkTitle = browser.contentDocument.title; + + var bookmarks = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].getService(Ci.nsINavBookmarksService); + if (bookmarks.getBookmarkIdsForURI(bookmarkURI, {}).length == 0) { + var bookmarkId = bookmarks.insertBookmark(bookmarks.bookmarksMenuFolder, bookmarkURI, bookmarks.DEFAULT_INDEX, bookmarkTitle); + document.getElementById("tool_star").setAttribute("starred", "true"); + + var ios = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService); + var favicon = document.getElementById("urlbar-favicon"); + var faviconURI = ios.newURI(favicon.src, null, null); + + var fis = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService); + fis.setAndLoadFaviconForPage(bookmarkURI, faviconURI, true); + } + else { + Bookmarks.edit(bookmarkURI); + } + break; + } + case "cmd_bookmarks": + Bookmarks.list(); + break; + case "cmd_newTab": + this.content.addBrowser("about:blank", null, null, false); + break; + case "cmd_closeTab": + this.content.removeBrowser(); + break; + case "cmd_switchTab": + this.content.select(); + break; + case "cmd_menu": + { +// var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker); +// fp.init(window, "Pick a file", Ci.nsIFilePicker.modeOpen); +// fp.appendFilters(Ci.nsIFilePicker.filterAll); +// fp.show(); + + var menu = document.getElementById("mainmenu"); + menu.openPopup(window.screenX, window.screenY, true); + break; + } + case "cmd_fullscreen": + window.fullScreen = window.fullScreen ? false : true; + break; + case "cmd_addons": + { + const EMTYPE = "Extension:Manager"; + + var aOpenMode = "extensions"; + var wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator); + var needToOpen = true; + var windowType = EMTYPE + "-" + aOpenMode; + var windows = wm.getEnumerator(windowType); + while (windows.hasMoreElements()) { + var theEM = windows.getNext().QueryInterface(Ci.nsIDOMWindowInternal); + if (theEM.document.documentElement.getAttribute("windowtype") == windowType) { + theEM.focus(); + needToOpen = false; + break; + } + } + + if (needToOpen) { + const EMURL = "chrome://mozapps/content/extensions/extensions.xul?type=" + aOpenMode; + const EMFEATURES = "chrome,dialog=no,resizable=yes"; + window.openDialog(EMURL, "", EMFEATURES); + } + break; + } + case "cmd_downloads": + Cc["@mozilla.org/download-manager-ui;1"].getService(Ci.nsIDownloadManagerUI).show(window); + } + } +}; + + +function ProgressController(aBrowser) { + this.init(aBrowser); +} + +ProgressController.prototype = { + _browser : null, + + init : function(aBrowser) { + this._browser = aBrowser; + this._browser.addProgressListener(this, Components.interfaces.nsIWebProgress.NOTIFY_ALL); + }, + + onStateChange : function(aWebProgress, aRequest, aStateFlags, aStatus) { + if (aStateFlags & Ci.nsIWebProgressListener.STATE_IS_NETWORK) { + if (aRequest && aWebProgress.DOMWindow == this._browser.contentWindow) { + if (aStateFlags & Ci.nsIWebProgressListener.STATE_START) { + LocationBar.update(TOOLBARSTATE_LOADING); + } + else if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP) { + this._browser.zoomController.scale = 1; + LocationBar.update(TOOLBARSTATE_LOADED); + } + } + } + + if (aStateFlags & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT) { + if (aStateFlags & Ci.nsIWebProgressListener.STATE_STOP) { + aWebProgress.DOMWindow.focus(); + //aWebProgress.DOMWindow.scrollbars.visible = false; + } + } + }, + + // This method is called to indicate progress changes for the currently + // loading page. + onProgressChange : function(aWebProgress, aRequest, aCurSelf, aMaxSelf, aCurTotal, aMaxTotal) { + }, + + // This method is called to indicate a change to the current location. + onLocationChange : function(aWebProgress, aRequest, aLocation) { + if (aWebProgress.DOMWindow == this._browser.contentWindow) { + LocationBar.setURI(aLocation.spec); + } + }, + + // This method is called to indicate a status changes for the currently + // loading page. The message is already formatted for display. + onStatusChange : function(aWebProgress, aRequest, aStatus, aMessage) { + }, + + // This method is called when the security state of the browser changes. + onSecurityChange : function(aWebProgress, aRequest, aState) { + }, + + /* nsISupports */ + QueryInterface : function(aIID) { + if (aIID.equals(Components.interfaces.nsIWebProgressListener) || + aIID.equals(Components.interfaces.nsISupportsWeakReference) || + aIID.equals(Components.interfaces.nsISupports)) + return this; + + throw Components.results.NS_ERROR_NO_INTERFACE; + } +}; +/* +window.addEventListener("keydown", fskey, true); + +function fskey(aEvent) { + alert(aEvent.keyCode); + if (117 == aEvent.keyCode) { + } +} +*/ + +var MouseController = function(browser) { + this.init(browser); +} + +MouseController.prototype = { + _browser: null, + _contextID : null, + + init: function(aBrowser) + { + this._browser = aBrowser; + this._browser.addEventListener("mousedown", this, true); + this._browser.addEventListener("mouseup",this, true); + }, + + handleEvent: function(e) + { + if (! e.type in this) + dump("MouseController called with unknown event type " + e.type + "\n"); + this[e.type](e); + }, + + mousedown: function(aEvent) + { + var self = this; + this._contextID = setTimeout(function() { self.contextMenu(aEvent); }, 900); + + if (aEvent.target instanceof HTMLInputElement || + aEvent.target instanceof HTMLTextAreaElement || + aEvent.target instanceof HTMLSelectElement) + return; + + // Check to see if we should treat this as a double-click + if (this.firstEvent && + (aEvent.timeStamp - this.firstEvent.timeStamp) < 400 && + Math.abs(aEvent.clientX - this.firstEvent.clientX) < 30 && + Math.abs(aEvent.clientY - this.firstEvent.clientY) < 30) { + this.dblclick(aEvent); + return; + } + + this.lastEvent = this.firstEvent = aEvent; + this.fingerDistance = 100; + this.mousemove = aEvent.button != 2 ? this.mousePan : this.mouseZoom; + this._browser.addEventListener("mousemove", this, true); + + //FIX Show scrollbars now + + aEvent.stopPropagation(); + aEvent.preventDefault(); + }, + + mouseup: function(aEvent) + { + this._browser.removeEventListener("mousemove", this, true); + if (this._contextID) { + clearTimeout(this._contextID); + this._contextID = null; + } + + //FIX Hide scrollbars now + + // Cancel link clicks if we've been dragging for a while + var totalDistance = Math.sqrt( + Math.pow(this.firstEvent.clientX - aEvent.clientX, 2) + + Math.pow(this.firstEvent.clientY - aEvent.clientY, 2)); + if (totalDistance > 10) + aEvent.preventDefault(); + + // Keep scrolling if there is enough momentum + /* + if (this.lastEvent && "momentum" in this.lastEvent && this.mousemove == this.mousePan) + { + var speedX = this.lastEvent.momentum.x / this.lastEvent.momentum.time; + var speedY = this.lastEvent.momentum.y / this.lastEvent.momentum.time; + const speedLimit = 6; + if (Math.abs(speedY) > speedLimit) + speedY = speedY > 0 ? speedLimit : -speedLimit; + if (Math.abs(speedX) > speedLimit) + speedX = speedX > 0 ? speedLimit : -speedLimit; + + var lastCall = Date.now(); + browser = this._browser; + const speedFactor = 0.1; + const decayFactor = 0.9995; + const cutoff = 0.2; + var intervalId = setInterval( function() { + var elapsed = (Date.now() - lastCall); + var x = elapsed * speedX * speedFactor, y = elapsed * speedY * speedFactor; + browser.contentWindow.scrollBy(-x, -y); + var slowdown = Math.pow(decayFactor, elapsed); + speedX *= slowdown; + speedY *= slowdown; + if (Math.abs(speedX) < cutoff && Math.abs(speedY) < cutoff) + clearInterval(intervalId); + }, 0); + }*/ + }, + + mouseZoom: function(e) + { + var deltaX = e.screenX - this.firstEvent.screenX + 100; + var deltaY = e.screenY - this.firstEvent.screenY; + var newDist = Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2)); + var scale = newDist / this.fingerDistance; + if (e.screenX < this.firstEvent.screenX && scale > 1) + scale = 1 / scale; + var newZoom = scale * this._browser.markupDocumentViewer.fullZoom; + this.fingerDistance = Math.max(0.1, newDist); + this._browser.zoomController.scale = newZoom; + this.lastEvent = e; + + //FIX Adjust scrollbars now + e.stopPropagation(); + e.preventDefault(); + }, + + mousePan: function(aEvent) + { + var x = aEvent.clientX - this.lastEvent.clientX; + var y = aEvent.clientY - this.lastEvent.clientY; + if (Math.abs(x) < 5 && Math.abs(y) < 5) + return; + + if (this._contextID) { + clearTimeout(this._contextID); + this._contextID = null; + } + + if (this.lastEvent) { + aEvent.momentum = { + time: Math.max(aEvent.timeStamp - this.lastEvent.timeStamp, 1), + x: x, + y: y + }; + } + this._browser.contentWindow.scrollBy(-x, -y); + this.lastEvent = aEvent; + + //FIX Adjust scrollbars now + + aEvent.stopPropagation(); + aEvent.preventDefault(); + }, + + dblclick: function(aEvent) + { + // Find the target by walking the dom. We want to zoom in on the block elements + var target = aEvent.target; + aEvent.preventDefault(); + while (target && target.nodeName != "HTML") { + var disp = window.getComputedStyle(target, "").getPropertyValue("display"); + if (!disp.match(/(inline)/g)) { + this._browser.zoomController.toggleZoom(target); + break; + } + else { + target = target.parentNode; + } + } + aEvent.stopPropagation(); + aEvent.preventDefault(); + }, + + contextMenu: function(aEvent) + { + if (this._contextID && this._browser.contextMenu) { + document.popupNode = aEvent.target; + var popup = document.getElementById(this._browser.contextMenu); + popup.openPopup(this._browser, "", aEvent.clientX, aEvent.clientY, true, false); + + this._browser.removeEventListener("mousemove", this, true); + this._contextID = null; + + aEvent.stopPropagation(); + aEvent.preventDefault(); + } + }, + + drag : function(aEvent){ + aEvent.stopPropagation(); + aEvent.preventDefault(); + return true; + }, + + dragstart : function(aEvent){ + return this.drag(aEvent); + }, + + draggesture : function(aEvent){ + return this.drag(aEvent); + } +} + + +function ZoomController(aBrowser) { + this._browser = aBrowser; +}; + +// ZoomControler sets browser zoom +ZoomController.prototype = { + _minScale : 0.1, + _maxScale : 3, + _target : null, + + set scale(s) + { + var clamp = Math.min(this._maxScale, Math.max(this._minScale, s)); + clamp = Math.floor(clamp * 1000) / 1000; // Round to 3 digits + if (clamp == this._browser.markupDocumentViewer.fullZoom) + return; + + this._browser.markupDocumentViewer.fullZoom = clamp; + + // If we've zoomed out of the viewport, scroll us back in + var leftEdge = this._browser.contentWindow.scrollX + this._browser.contentWindow.document.documentElement.clientWidth; + var scrollX = this._browser.contentWindow.document.documentElement.scrollWidth - leftEdge; + if (scrollX < 0) + this._browser.contentWindow.scrollBy(scrollX, 0); + }, + + get scale() + { + return this._browser.markupDocumentViewer.fullZoom; + }, + + reset: function() + { + this._minScale = ZoomController.prototype._minScale; + this._maxScale = ZoomController.prototype._maxScale; + }, + + fitContent: function() + { + this._target = null; + try { + var oldScale = this.scale; + this.scale = 1; // reset the scale to 1 forces document to preferred size + var body = this._browser.contentWindow.document.body; + var html = this._browser.contentWindow.document.documentElement; + var newScale = this.scale; + var finalWidth = html.clientWidth; + } + catch(e) { + dump(e + "\n"); + return; + } + + var prefScrollWidth = Math.max(html.scrollWidth, body.scrollWidth); // empirical hack, no idea why + if (prefScrollWidth > (this._browser.boxObject.width - 10) ) { + // body wider than window, scale id down + // we substract 10 to compensate for 10 pixel browser left margin + newScale = (this._browser.boxObject.width ) / prefScrollWidth; + finalWidth = prefScrollWidth; + } + body.style.minWidth = body.style.maxWidth = (finalWidth -20) + "px"; + this._minScale = Math.max(this._minScale, newScale); + this.scale = newScale; + }, + + getPagePosition: function (el) + { + var r = el.getBoundingClientRect(); + retVal = { + width: r.right - r.left, + height: r.bottom - r.top, + x: r.left + this._browser.contentWindow.scrollX, + y: r.top + this._browser.contentWindow.scrollY + }; + return retVal; + }, + + getWindowRect: function() + { + return { + x: this._browser.contentWindow.scrollX, + y: this._browser.contentWindow.scrollY, + width: this._browser.boxObject.width / this.scale, + height: this._browser.boxObject.height / this.scale + }; + }, + + toggleZoom: function(el) + { + if (!el) return; + + if (this.scale == 1 || el != this._target) { + this.zoomToElement(el); + this._target = el; + } + else { + this.scale = 1; + this._target = null; + } + }, + + zoomToElement: function(el) + { + var margin = 8; + + // First get the width of the element so we can scale to its width + var elRect = this.getPagePosition(el); + this.scale = (this._browser.boxObject.width) / (elRect.width + 2 * margin); + + // Now that we are scaled, we need to scroll to the element + elRect = this.getPagePosition(el); + winRect = this.getWindowRect(); + this._browser.contentWindow.scrollTo(Math.max(elRect.x - margin, 0), Math.max(0, elRect.y - margin)); + } +}; diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul new file mode 100644 index 00000000000..8ef49c86596 --- /dev/null +++ b/mobile/chrome/content/browser.xul @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + &sanitizeItems.label; + + + + + + + + + + + + diff --git a/mobile/chrome/jar.mn b/mobile/chrome/jar.mn index 1b71dad91e3..fef5afd0caf 100644 --- a/mobile/chrome/jar.mn +++ b/mobile/chrome/jar.mn @@ -16,6 +16,9 @@ browser.jar: branding/brand.dtd (locale/@AB_CD@/brand/brand.dtd) branding/brand.properties (locale/@AB_CD@/brand/brand.properties) % style chrome://mozapps/content/extensions/extensions.xul chrome://browser/skin/extensions.css + content/preferences/richpref.xml +* content/sanitize.xul +* content/sanitize.js classic.jar: % skin browser classic/1.0 % @@ -33,6 +36,8 @@ classic.jar: images/toolbar.png (skin/images/toolbar.png) images/mono-toolbar.png (skin/images/mono-toolbar.png) images/toolbar-background.png (skin/images/toolbar-background.png) + section.css (skin/section.css) + richpref.css (skin/richpref.css) @AB_CD@.jar: % locale browser @AB_CD@ % @@ -40,3 +45,4 @@ classic.jar: browser.properties (locale/@AB_CD@/browser.properties) search.properties (locale/@AB_CD@/search.properties) region.properties (locale/@AB_CD@/region.properties) + preferences.dtd (locale/@AB_CD@/preferences.dtd) diff --git a/mobile/chrome/locale/en-US/preferences.dtd b/mobile/chrome/locale/en-US/preferences.dtd new file mode 100644 index 00000000000..397e597d914 --- /dev/null +++ b/mobile/chrome/locale/en-US/preferences.dtd @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/mobile/chrome/skin/browser.css b/mobile/chrome/skin/browser.css index 9013033a6f6..b06a6e7b153 100644 --- a/mobile/chrome/skin/browser.css +++ b/mobile/chrome/skin/browser.css @@ -451,3 +451,7 @@ findbar { min-width: 280px; padding: 10px; } + +#pref-pane { + background-color: rgba(123,125,123,0.9); +} diff --git a/mobile/chrome/skin/richpref.css b/mobile/chrome/skin/richpref.css new file mode 100644 index 00000000000..d43b41e95c9 --- /dev/null +++ b/mobile/chrome/skin/richpref.css @@ -0,0 +1,20 @@ +richlistitem.section { + font-size: 1.5em ! important; + color: white; + background-color: grey; +} + +.prefbox { + padding: .3em .3em .3em .5em; + border: thin solid lightgrey; +} + +.preftitle { + font-size: 1.2em ! important; +} + +.prefdesc { + font-size: 1em ! important; + color: grey; + background-color: white; +} diff --git a/mobile/chrome/skin/section.css b/mobile/chrome/skin/section.css new file mode 100644 index 00000000000..fef8a3d307b --- /dev/null +++ b/mobile/chrome/skin/section.css @@ -0,0 +1,22 @@ +section .section-head { + font-size: larger; + font-weight: bolder; + display: list-item; +} + +section .section-indicator { + width: 16px; + height: 16px; +} + +section image.closed { + list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.gif"); +} + +section image.open { + list-style-image: url("chrome://global/skin/arrow/arrow-dn-sharp.gif"); +} + +section > vbox > vbox { + margin-left: 16px; +} From 565c8a00030343c8ec5e1d0c8c14be9b4ad5ffe1 Mon Sep 17 00:00:00 2001 From: Neil Deakin Date: Sun, 7 Sep 2008 08:12:05 -0400 Subject: [PATCH 0137/2836] Bug 446672, improve appearance of notification bars so all buttons are visible, r=gavin --- mobile/chrome/content/browser.css | 8 ++++ mobile/chrome/content/browser.js | 14 +++--- mobile/chrome/content/notification.xml | 44 +++++++++++++++++++ mobile/chrome/jar.mn | 2 + mobile/chrome/locale/en-US/browser.properties | 6 ++- mobile/chrome/skin/notification.css | 26 +++++++++++ 6 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 mobile/chrome/content/notification.xml create mode 100644 mobile/chrome/skin/notification.css diff --git a/mobile/chrome/content/browser.css b/mobile/chrome/content/browser.css index 78e4f8caa14..21d7aa6f3ac 100644 --- a/mobile/chrome/content/browser.css +++ b/mobile/chrome/content/browser.css @@ -9,3 +9,11 @@ deckbrowser { richlistitem[type="documenttab"] { -moz-binding: url("chrome://browser/content/deckbrowser.xml#documenttab"); } + +notification { + -moz-binding: url("chrome://browser/content/notification.xml#notification"); +} + +notification button { + -moz-binding: url("chrome://browser/content/notification.xml#notification-button"); +} diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js index b1ed2841172..69c89952a4c 100644 --- a/mobile/chrome/content/browser.js +++ b/mobile/chrome/content/browser.js @@ -163,26 +163,30 @@ var Browser = { var bundle_browser = document.getElementById("bundle_browser"); var buttons = [{ label: bundle_browser.getString("gelocation.exactLocation"), + subLabel: bundle_browser.getString("gelocation.exactLocation.subLabel"), accessKey: bundle_browser.getString("gelocation.exactLocationKey"), callback: function(){request.allow()} }, { label: bundle_browser.getString("gelocation.neighborhoodLocation"), + subLabel: bundle_browser.getString("gelocation.neighborhoodLocation.subLabel"), accessKey: bundle_browser.getString("gelocation.neighborhoodLocationKey"), callback: function(){request.allowButFuzz()} }, { label: bundle_browser.getString("gelocation.nothingLocation"), + subLabel: "", accessKey: bundle_browser.getString("gelocation.nothingLocationKey"), callback: function(){request.cancel()} }]; var message = bundle_browser.getFormattedString("geolocation.requestMessage", [request.requestingURI.spec]); - notificationBox.appendNotification(message, - "geolocation", - null, // todo "chrome://browser/skin/Info.png", - notificationBox.PRIORITY_INFO_HIGH, - buttons); + var notification = notificationBox.appendNotification(message, + "geolocation", null, // todo "chrome://browser/skin/Info.png", + notificationBox.PRIORITY_INFO_HIGH, buttons); + var children = notification.childNodes; + for (var b = 0; b < children.length; b++) + children[b].setAttribute("sublabel", children[b].buttonInfo.subLabel); return 1; } } diff --git a/mobile/chrome/content/notification.xml b/mobile/chrome/content/notification.xml new file mode 100644 index 00000000000..517fec05843 --- /dev/null +++ b/mobile/chrome/content/notification.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile/chrome/jar.mn b/mobile/chrome/jar.mn index 1b71dad91e3..a5d139892c9 100644 --- a/mobile/chrome/jar.mn +++ b/mobile/chrome/jar.mn @@ -8,6 +8,7 @@ browser.jar: content/commandUtil.js (content/commandUtil.js) content/urlbar.xml (content/urlbar.xml) content/deckbrowser.xml (content/deckbrowser.xml) + content/notification.xml (content/notification.xml) content/browser.css (content/browser.css) content/scrollbars.css (content/scrollbars.css) content/content.css (content/content.css) @@ -21,6 +22,7 @@ classic.jar: % skin browser classic/1.0 % browser.css (skin/browser.css) extensions.css (skin/extensions.css) + notification.css (skin/notification.css) images/close.png (skin/images/close.png) images/close-small.png (skin/images/close-small.png) images/default-favicon.png (skin/images/default-favicon.png) diff --git a/mobile/chrome/locale/en-US/browser.properties b/mobile/chrome/locale/en-US/browser.properties index e06a59a8e12..5449e65d26a 100644 --- a/mobile/chrome/locale/en-US/browser.properties +++ b/mobile/chrome/locale/en-US/browser.properties @@ -26,9 +26,11 @@ identity.unknown.tooltip=This web site does not supply identity information. identity.ownerUnknown2=(unknown) # Geolocation UI -gelocation.exactLocation=Exact Location (within 10 feet) +gelocation.exactLocation=Exact Location +gelocation.exactLocation.subLabel=within 10 feet gelocation.exactLocationKey=E -gelocation.neighborhoodLocation=Neighborhood (within 1 mile) +gelocation.neighborhoodLocation=Neighborhood +gelocation.neighborhoodLocation.subLabel=within 1 mile gelocation.neighborhoodLocationKey=N gelocation.nothingLocation=Nothing gelocation.nothingLocationKey=C diff --git a/mobile/chrome/skin/notification.css b/mobile/chrome/skin/notification.css new file mode 100644 index 00000000000..4dedcc69844 --- /dev/null +++ b/mobile/chrome/skin/notification.css @@ -0,0 +1,26 @@ +notification { + background: rgb(255, 255, 176); + color: black; +} + +notification button { + -moz-appearance: none !important; + background: none !important; + border: 1px solid rgb(192, 192, 160) !important; + -moz-border-radius: 6px !important; + -moz-border-top-colors: rgb(192, 192, 160) !important; + -moz-border-right-colors: rgb(192, 192, 160) !important; + -moz-border-bottom-colors: rgb(192, 192, 160) !important; + -moz-border-left-colors: rgb(192, 192, 160) !important; + margin: 12px 0 12px 6px; +} + +.sn-button-text { + background: transparent !important; + color: black !important; +} + +.sn-button-extra-text { + color: grey; + font-size: 8pt !important; +} From a9bd2bec2297243faf12228afb8c1b98ac51f7d1 Mon Sep 17 00:00:00 2001 From: Johnathan Nightingale Date: Tue, 9 Sep 2008 11:52:21 -0400 Subject: [PATCH 0138/2836] Fennec should implement firefox-style security error ui. b=437372 r=enndeakin --- mobile/app/mobile.js | 3 + mobile/chrome/content/browser.js | 56 ++++++ mobile/chrome/jar.mn | 3 + .../locale/en-US/overrides/netError.dtd | 180 ++++++++++++++++++ 4 files changed, 242 insertions(+) create mode 100644 mobile/chrome/locale/en-US/overrides/netError.dtd diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js index 65fb53e88cc..0c113ece056 100644 --- a/mobile/app/mobile.js +++ b/mobile/app/mobile.js @@ -161,6 +161,9 @@ pref("accessibility.typeaheadfind.casesensitive", 0); // pointer to the default engine name pref("browser.search.defaultenginename", "chrome://browser/locale/region.properties"); +// SSL error page behaviour +pref("browser.ssl_override_behavior", 2); +pref("browser.xul.error_pages.expert_bad_cert", false); // disable logging for the search service by default pref("browser.search.log", false); diff --git a/mobile/chrome/content/browser.js b/mobile/chrome/content/browser.js index 69c89952a4c..97b6b6619f2 100644 --- a/mobile/chrome/content/browser.js +++ b/mobile/chrome/content/browser.js @@ -96,6 +96,7 @@ var Browser = { BrowserUI.init(); + this._content.addEventListener("command", this._handleContentCommand, false); this._content.addEventListener("DOMUpdatePageReport", gPopupBlockerObserver.onUpdatePageReport, false); this._content.tabList = document.getElementById("tab-list"); this._content.newTab(true); @@ -289,6 +290,61 @@ var Browser = { } } } + }, + + /** + * Handle command event bubbling up from content. This allows us to do chrome- + * privileged things based on buttons in, e.g., unprivileged error pages. + * Obviously, care should be taken not to trust events that web pages could have + * synthesized. + */ + _handleContentCommand: function (aEvent) { + // Don't trust synthetic events + if (!aEvent.isTrusted) + return; + + var ot = aEvent.originalTarget; + var errorDoc = ot.ownerDocument; + + // If the event came from an ssl error page, it is probably either the "Add + // Exception…" or "Get me out of here!" button + if (/^about:neterror\?e=nssBadCert/.test(errorDoc.documentURI)) { + if (ot == errorDoc.getElementById('exceptionDialogButton')) { + var params = { exceptionAdded : false }; + + try { + switch (gPrefService.getIntPref("browser.ssl_override_behavior")) { + case 2 : // Pre-fetch & pre-populate + params.prefetchCert = true; + case 1 : // Pre-populate + params.location = errorDoc.location.href; + } + } catch (e) { + Components.utils.reportError("Couldn't get ssl_override pref: " + e); + } + + window.openDialog('chrome://pippki/content/exceptionDialog.xul', + '','chrome,centerscreen,modal', params); + + // If the user added the exception cert, attempt to reload the page + if (params.exceptionAdded) + errorDoc.location.reload(); + } + else if (ot == errorDoc.getElementById('getMeOutOfHereButton')) { + // Get the start page from the *default* pref branch, not the user's + var defaultPrefs = Cc["@mozilla.org/preferences-service;1"] + .getService(Ci.nsIPrefService).getDefaultBranch(null); + var url = "about:blank"; + try { + url = defaultPrefs.getCharPref("browser.startup.homepage"); + // If url is a pipe-delimited set of pages, just take the first one. + if (url.indexOf("|") != -1) + url = url.split("|")[0]; + } catch (e) { /* Fall back on about blank */ } + + Browser.currentBrowser.loadURI(url, null, null, false); + } + } } }; diff --git a/mobile/chrome/jar.mn b/mobile/chrome/jar.mn index a5d139892c9..9ba18627ed4 100644 --- a/mobile/chrome/jar.mn +++ b/mobile/chrome/jar.mn @@ -42,3 +42,6 @@ classic.jar: browser.properties (locale/@AB_CD@/browser.properties) search.properties (locale/@AB_CD@/search.properties) region.properties (locale/@AB_CD@/region.properties) +# Fennec-specific overrides of generic strings +* netError.dtd (locale/@AB_CD@/overrides/netError.dtd) +% override chrome://global/locale/netErrorApp.dtd chrome://browser/locale/netError.dtd diff --git a/mobile/chrome/locale/en-US/overrides/netError.dtd b/mobile/chrome/locale/en-US/overrides/netError.dtd new file mode 100644 index 00000000000..60d0e47584f --- /dev/null +++ b/mobile/chrome/locale/en-US/overrides/netError.dtd @@ -0,0 +1,180 @@ + +%brandDTD; + + + + + + + + + + + + + + +
  • Check the address for typing errors such as + ww.example.com instead of + www.example.com
    • +
  • If you are unable to load any pages, check your computer's network + connection.
    • +
  • If your computer or network is protected by a firewall or proxy, make sure + that &brandShortName; is permitted to access the Web.
    • + +"> + + + +
  • Check the file name for capitalization or other typing errors.
    • +
  • Check to see if the file was moved, renamed or deleted.
    • + +"> + + + +&brandShortName; can't load this page for some reason.

    +"> + + + +
  • Web addresses are usually written like + http://www.example.com/
    • +
  • Make sure that you're using forward slashes (i.e. + /).
    • + +"> + + + + + + +
  • Uncheck "Work Offline" in the File menu, then try again.
    • + +"> + + + +
  • Please contact the website owners to inform them of this problem.
    • + +"> + + + +
  • Please contact the website owners to inform them of this problem.
    • + +"> + + + + + + + + + +
  • You might need to install other software to open this address.
    • + +"> + + + +
  • Check the proxy settings to make sure that they are correct.
    • +
  • Contact your network administrator to make sure the proxy server is + working.
    • + +"> + + + +
  • Check the proxy settings to make sure that they are correct.
    • +
  • Check to make sure your computer has a working network connection.
    • +
  • If your computer or network is protected by a firewall or proxy, make sure + that &brandShortName; is permitted to access the Web.
    • + +"> + + + +
  • This problem can sometimes be caused by disabling or refusing to accept + cookies.
    • + +"> + + + +
  • Check to make sure your system has the Personal Security Manager + installed.
    • +
  • This might be due to a non-standard configuration on the server.
    • + +"> + + + +
  • The page you are trying to view can not be shown because the authenticity of the received data could not be verified.
    • +
  • Please contact the web site owners to inform them of this problem. Alternatively, use the command found in the help menu to report this broken site.
    • + +"> + + + +
  • This could be a problem with the server's configuration, or it could be +someone trying to impersonate the server.
    • +
  • If you have connected to this server successfully in the past, the error may +be temporary, and you can try again later.
    • + +"> + + +
  • The site could be temporarily unavailable or too busy. Try again in a few + moments.
    • +
  • If you are unable to load any pages, check your computer's network + connection.
    • +
  • If your computer or network is protected by a firewall or proxy, make sure + that &brandShortName; is permitted to access the Web.
    • + +"> + + +Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

    +

    Web site owners who believe their site has been reported as an attack site in error may request a review.

    +"> + + +Entering any personal information on this page may result in identity theft or other fraud.

    +

    These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.

    +"> + + + + + + + +You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.

    + + + +"> From e7f1f43347dd3e6ff7fc3093ca9d53581cbf1338 Mon Sep 17 00:00:00 2001 From: Gavin Sharp Date: Wed, 10 Sep 2008 15:30:52 -0400 Subject: [PATCH 0139/2836] bug 452074: re-theme fennec UI, r=mfinkle, images by Madhava Enros and Sean Martell --- mobile/chrome/content/browser-ui.js | 6 +- mobile/chrome/content/browser.xul | 36 +++-- mobile/chrome/jar.mn | 14 ++ mobile/chrome/skin/browser.css | 146 +++++++++++++----- .../skin/images/addressbar_endcap_l_off.png | Bin 0 -> 1678 bytes .../skin/images/addressbar_endcap_r_off.png | Bin 0 -> 1715 bytes .../chrome/skin/images/addressbar_middle.png | Bin 0 -> 173 bytes mobile/chrome/skin/images/left_buttons.png | Bin 0 -> 4698 bytes .../skin/images/left_sidebar_bottom.png | Bin 0 -> 244 bytes .../skin/images/left_sidebar_middle.png | Bin 0 -> 169 bytes .../chrome/skin/images/left_sidebar_top.png | Bin 0 -> 252 bytes mobile/chrome/skin/images/right_buttons.png | Bin 0 -> 18650 bytes .../skin/images/right_sidebar_bottom.png | Bin 0 -> 230 bytes .../skin/images/right_sidebar_middle.png | Bin 0 -> 158 bytes .../chrome/skin/images/right_sidebar_top.png | Bin 0 -> 258 bytes mobile/chrome/skin/images/titlebar.png | Bin 0 -> 17681 bytes .../chrome/skin/images/toolbar-background.png | Bin 675 -> 182 bytes 17 files changed, 149 insertions(+), 53 deletions(-) create mode 100644 mobile/chrome/skin/images/addressbar_endcap_l_off.png create mode 100644 mobile/chrome/skin/images/addressbar_endcap_r_off.png create mode 100644 mobile/chrome/skin/images/addressbar_middle.png create mode 100644 mobile/chrome/skin/images/left_buttons.png create mode 100644 mobile/chrome/skin/images/left_sidebar_bottom.png create mode 100644 mobile/chrome/skin/images/left_sidebar_middle.png create mode 100644 mobile/chrome/skin/images/left_sidebar_top.png create mode 100644 mobile/chrome/skin/images/right_buttons.png create mode 100644 mobile/chrome/skin/images/right_sidebar_bottom.png create mode 100644 mobile/chrome/skin/images/right_sidebar_middle.png create mode 100644 mobile/chrome/skin/images/right_sidebar_top.png create mode 100644 mobile/chrome/skin/images/titlebar.png diff --git a/mobile/chrome/content/browser-ui.js b/mobile/chrome/content/browser-ui.js index 08f84373d7b..d5f547509a0 100644 --- a/mobile/chrome/content/browser-ui.js +++ b/mobile/chrome/content/browser-ui.js @@ -172,7 +172,7 @@ var BrowserUI = { _dragData : { dragging : false, sY : 0, sTop : 0 }, - _scrollToolbar : function(aEvent) { + _scrollToolbar : function bui_scrollToolbar(aEvent) { if (this._dragData.dragging && Browser.content.scrollY == 0) { let toolbar = document.getElementById("toolbar-main"); let browser = document.getElementById("browser"); @@ -685,6 +685,7 @@ var BrowserUI = { case "cmd_closeTab": case "cmd_addons": case "cmd_actions": + case "cmd_prefs": isSupported = true; break; default: @@ -765,6 +766,9 @@ var BrowserUI = { case "cmd_actions": this.show(PANELMODE_ADDONS); break; + case "cmd_prefs": + //XXX + break; } } }; diff --git a/mobile/chrome/content/browser.xul b/mobile/chrome/content/browser.xul index 49be5906253..e3fc31f2ac6 100644 --- a/mobile/chrome/content/browser.xul +++ b/mobile/chrome/content/browser.xul @@ -194,26 +194,28 @@ - -