зеркало из https://github.com/mozilla/pjs.git
Fix bustage of prefs.
This commit is contained in:
hyatt%netscape.com
Родитель
10f6aad257
Коммит
1a69866a1a
|
|
@ -56,7 +56,7 @@
|
|||
<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
|
||||
<script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
|
||||
<script type="application/x-javascript" src="chrome://browser/content/contentAreaClick.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
|
||||
<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
|
||||
<script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,267 @@
|
|||
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Netscape 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/NPL/
|
||||
*
|
||||
* 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.org code.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Netscape Communications Corporation.
|
||||
* Portions created by the Initial Developer are Copyright (C) 1998
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Alec Flett <alecf@netscape.com>
|
||||
* Ben Goodger <ben@netscape.com>
|
||||
* Mike Pinkerton <pinkerton@netscape.com>
|
||||
* Blake Ross <blakeross@telocity.com>
|
||||
*
|
||||
* 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 NPL, 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 NPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/*
|
||||
* - [ Dependencies ] ---------------------------------------------------------
|
||||
* utilityOverlay.js:
|
||||
* - gatherTextUnder
|
||||
*/
|
||||
|
||||
var pref = null;
|
||||
pref = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
.getService(Components.interfaces.nsIPrefBranch);
|
||||
|
||||
// Prefill a single text field
|
||||
function prefillTextBox(target) {
|
||||
|
||||
// obtain values to be used for prefilling
|
||||
var walletService = Components.classes["@mozilla.org/wallet/wallet-service;1"].getService(Components.interfaces.nsIWalletService);
|
||||
var value = walletService.WALLET_PrefillOneElement(window._content, target);
|
||||
if (value) {
|
||||
|
||||
// result is a linear sequence of values, each preceded by a separator character
|
||||
// convert linear sequence of values into an array of values
|
||||
var separator = value[0];
|
||||
var valueList = value.substring(1, value.length).split(separator);
|
||||
|
||||
target.value = valueList[0];
|
||||
/*
|
||||
* Following code is a replacement for above line. In the case of multiple values, it
|
||||
* presents the user with a dialog containing a list from which he can select the value
|
||||
* he wants. However it is being commented out for now because of several problems, namely
|
||||
*
|
||||
* 1. There is no easy way to put localizable strings for the title and message of
|
||||
* the dialog without introducing a .properties file which currently doesn't exist
|
||||
* 2. Using blank title and messages as shown below have a problem because a zero-length
|
||||
* title is being displayed as some garbage characters (which is why the code below
|
||||
* has a title of " " instead of ""). This is a separate bug which will have to be
|
||||
* investigated further.
|
||||
* 3. The current wallet tables present alternate values for items such as shipping
|
||||
* address -- namely billing address and home address. Up until now, these alternate
|
||||
* values have never been a problem because the preferred value is always first and is
|
||||
* all the user sees when doing a prefill. However now he will be presented with a
|
||||
* list showing all these values and asking him to pick one, even though the wallet
|
||||
* code was clearly able to determine that he meant shipping address and not billing
|
||||
* address.
|
||||
* 4. There is a relatively long delay before the dialog come up whereas values are
|
||||
* filled in quickly when no dialog is involved.
|
||||
*
|
||||
* Once this feature is checked in, a separate bug will be opened asking that the above
|
||||
* problems be examined and this dialog turned on
|
||||
|
||||
if (valueList.length == 1) {
|
||||
// only one value, use it for prefilling
|
||||
target.value = valueList[0];
|
||||
} else {
|
||||
|
||||
// more than one value, have user select the one he wants
|
||||
var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].getService();
|
||||
promptService = promptService.QueryInterface(Components.interfaces.nsIPromptService);
|
||||
var position = {};
|
||||
var title = " ";
|
||||
var message = "";
|
||||
var ok =
|
||||
promptService.select
|
||||
(window, title, message, valueList.length, valueList, position)
|
||||
if (ok) {
|
||||
target.value = valueList[position.value];
|
||||
}
|
||||
}
|
||||
|
||||
* End of commented out code
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
// Called whenever the user clicks in the content area,
|
||||
// except when left-clicking on links (special case)
|
||||
// should always return true for click to go through
|
||||
function contentAreaClick(event)
|
||||
{
|
||||
var target = event.target;
|
||||
var linkNode;
|
||||
|
||||
var local_name = target.localName;
|
||||
|
||||
if (local_name) {
|
||||
local_name = local_name.toLowerCase();
|
||||
}
|
||||
|
||||
switch (local_name) {
|
||||
case "a":
|
||||
case "area":
|
||||
case "link":
|
||||
if (target.hasAttribute("href"))
|
||||
linkNode = target;
|
||||
break;
|
||||
case "input":
|
||||
if ((event.target.type.toLowerCase() == "text" || event.target.type == "") // text field
|
||||
&& event.detail == 2 // double click
|
||||
&& event.button == 0 // left mouse button
|
||||
&& event.target.value.length == 0) { // no text has been entered
|
||||
prefillTextBox(target); // prefill the empty text field if possible
|
||||
}
|
||||
break;
|
||||
default:
|
||||
linkNode = findParentNode(event.originalTarget, "a");
|
||||
// <a> cannot be nested. So if we find an anchor without an
|
||||
// href, there is no useful <a> around the target
|
||||
if (linkNode && !linkNode.hasAttribute("href"))
|
||||
linkNode = null;
|
||||
break;
|
||||
}
|
||||
if (linkNode) {
|
||||
handleLinkClick(event, linkNode.href, linkNode);
|
||||
return true;
|
||||
} else {
|
||||
// Try simple XLink
|
||||
var href;
|
||||
linkNode = target;
|
||||
while (linkNode) {
|
||||
if (linkNode.nodeType == Node.ELEMENT_NODE) {
|
||||
href = linkNode.getAttributeNS("http://www.w3.org/1999/xlink", "href");
|
||||
break;
|
||||
}
|
||||
linkNode = linkNode.parentNode;
|
||||
}
|
||||
if (href && href != "") {
|
||||
href = makeURLAbsolute(target.baseURI,href);
|
||||
handleLinkClick(event, href, null);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
if (pref && event.button == 1 &&
|
||||
!findParentNode(event.originalTarget, "scrollbar") &&
|
||||
pref.getBoolPref("middlemouse.contentLoadURL")) {
|
||||
if (middleMousePaste(event)) {
|
||||
event.preventBubble();
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function openNewTabOrWindow(event, href)
|
||||
{
|
||||
// should we open it in a new tab?
|
||||
if (pref && pref.getBoolPref("browser.tabs.opentabfor.middleclick") &&
|
||||
("getBrowser" in window) && getBrowser().localName == "tabbrowser") {
|
||||
var loadInBackground = pref.getBoolPref("browser.tabs.loadInBackground");
|
||||
if (event.shiftKey)
|
||||
loadInBackground = !loadInBackground;
|
||||
var theTab = getBrowser().addTab(href, getReferrer(document));
|
||||
if (!loadInBackground)
|
||||
getBrowser().selectedTab = theTab;
|
||||
event.preventBubble();
|
||||
return true;
|
||||
}
|
||||
|
||||
// should we open it in a new window?
|
||||
if (pref && pref.getBoolPref("middlemouse.openNewWindow")) {
|
||||
openNewWindowWith(href);
|
||||
event.preventBubble();
|
||||
return true;
|
||||
}
|
||||
|
||||
// let someone else deal with it
|
||||
return false;
|
||||
}
|
||||
|
||||
function handleLinkClick(event, href, linkNode)
|
||||
{
|
||||
switch (event.button) {
|
||||
case 0: // if left button clicked
|
||||
if (event.metaKey || event.ctrlKey) { // and meta or ctrl are down
|
||||
if (openNewTabOrWindow(event, href))
|
||||
return true;
|
||||
}
|
||||
var saveModifier = true;
|
||||
if (pref) {
|
||||
try {
|
||||
saveModifier = pref.getBoolPref("ui.key.saveLink.shift");
|
||||
}
|
||||
catch(ex) {
|
||||
}
|
||||
}
|
||||
saveModifier = saveModifier ? event.shiftKey : event.altKey;
|
||||
|
||||
if (saveModifier) { // if saveModifier is down
|
||||
saveURL(href, linkNode ? gatherTextUnder(linkNode) : "");
|
||||
return true;
|
||||
}
|
||||
if (event.altKey) // if alt is down
|
||||
return true; // do nothing
|
||||
return false;
|
||||
case 1: // if middle button clicked
|
||||
if (openNewTabOrWindow(event, href))
|
||||
return true;
|
||||
break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
function middleMousePaste( event )
|
||||
{
|
||||
var url = readFromClipboard();
|
||||
if (!url)
|
||||
return false;
|
||||
url = getShortcutOrURI(url);
|
||||
if (!url)
|
||||
return false;
|
||||
|
||||
// On ctrl-middleclick, open in new window or tab.
|
||||
if (event.ctrlKey)
|
||||
return openNewTabOrWindow(event, url);
|
||||
|
||||
// If ctrl wasn't down, then just load the url in the current win/tab.
|
||||
loadURI(url);
|
||||
event.preventBubble();
|
||||
return true;
|
||||
}
|
||||
|
||||
function makeURLAbsolute( base, url )
|
||||
{
|
||||
// Construct nsIURL.
|
||||
var ioService = Components.classes["@mozilla.org/network/io-service;1"]
|
||||
.getService(Components.interfaces.nsIIOService);
|
||||
var baseURI = ioService.newURI(base, null, null);
|
||||
|
||||
return ioService.newURI(baseURI.resolve(url), null, null).spec;
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@ browser.jar:
|
|||
* content/browser/browser.xul (content/browser.xul)
|
||||
* content/browser/browser.js (content/browser.js)
|
||||
content/browser/browser.css (content/browser.css)
|
||||
content/browser/contentAreaClick.js (content/contentAreaClick.js)
|
||||
* content/browser/utilityOverlay.js (content/utilityOverlay.js)
|
||||
content/browser/about.gif (content/about.gif)
|
||||
* content/browser/aboutDialog.xul (content/aboutDialog.xul)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# -*- Mode: Java; tab-width: 4; c-basic-offset: 4; -*-
|
||||
/* -*- Mode: Java; tab-width: 4; c-basic-offset: 4; -*-
|
||||
#
|
||||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
|
|
@ -17,6 +17,7 @@
|
|||
#
|
||||
# Contributor(s):
|
||||
# Ben "Count XULula" Goodger <ben@netscape.com>
|
||||
*/
|
||||
|
||||
const _DEBUG = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ browser.jar:
|
|||
* content/browser/pref/pref-privacy.xul (content/pref-privacy.xul)
|
||||
* content/browser/pref/pref-popups.xul (content/pref-popups.xul)
|
||||
* content/browser/pref/pref.xul (content/pref.xul)
|
||||
* content/browser/pref/nsPrefWindow.js (content/nsPrefWindow.js)
|
||||
content/browser/pref/nsPrefWindow.js (content/nsPrefWindow.js)
|
||||
* content/browser/pref/pref-winhooks.xul (content/pref-winhooks.xul)
|
||||
* content/browser/pref/pref-winhooks.js (content/pref-winhooks.js)
|
||||
* content/browser/pref/pref-tabs.xul (content/pref-tabs.xul)
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче