mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
Bug 296764: Move html keybindings to chrome to make sure they work even with js turned off
r=bsmedberg sr=jst a=bsmedberg
This commit is contained in:
parent
545ec4d5a4
commit
23fe2ae1ed
@ -267,8 +267,6 @@ bin\res\charsetData.properties
|
||||
bin\res\langGroups.properties
|
||||
bin\res\language.properties
|
||||
bin\res\entityTables\*
|
||||
bin\res\builtin\htmlBindings.xml
|
||||
bin\res\builtin\platformHTMLBindings.xml
|
||||
|
||||
; [Personal Security Manager]
|
||||
;
|
||||
|
@ -43,29 +43,17 @@ VPATH = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
|
||||
PLATFORM_DIR = win
|
||||
DIRS = win
|
||||
else
|
||||
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
|
||||
PLATFORM_DIR = mac
|
||||
DIRS = mac
|
||||
else
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
|
||||
PLATFORM_DIR = gtk2
|
||||
DIRS = gtk2
|
||||
else
|
||||
PLATFORM_DIR = unix
|
||||
DIRS = unix
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
PLATFORM_BINDINGS = $(srcdir)/$(PLATFORM_DIR)/platformHTMLBindings.xml
|
||||
PREPROCESS_BINDINGS = $(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(PLATFORM_BINDINGS)
|
||||
|
||||
$(DIST)/bin/res/builtin/platformHTMLBindings.xml $(DESTDIR)$(mozappdir)/res/builtin/platformHTMLBindings.xml: $(PLATFORM_BINDINGS) $(wildcard $(srcdir)/*.inc) Makefile
|
||||
@if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); else true; fi
|
||||
@rm -f $@
|
||||
@$(PREPROCESS_BINDINGS) > $@
|
||||
|
||||
libs:: $(DIST)/bin/res/builtin/platformHTMLBindings.xml
|
||||
|
||||
install:: $(DESTDIR)$(mozappdir)/res/builtin/platformHTMLBindings.xml
|
||||
|
1
content/xbl/builtin/gtk2/.cvsignore
Normal file
1
content/xbl/builtin/gtk2/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
45
content/xbl/builtin/gtk2/Makefile.in
Normal file
45
content/xbl/builtin/gtk2/Makefile.in
Normal file
@ -0,0 +1,45 @@
|
||||
#
|
||||
# ***** 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.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Jonas Sicking.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2005
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of 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
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
2
content/xbl/builtin/gtk2/jar.mn
Executable file
2
content/xbl/builtin/gtk2/jar.mn
Executable file
@ -0,0 +1,2 @@
|
||||
toolkit.jar:
|
||||
* content/global/platformHTMLBindings.xml (platformHTMLBindings.xml)
|
1
content/xbl/builtin/mac/.cvsignore
Normal file
1
content/xbl/builtin/mac/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
45
content/xbl/builtin/mac/Makefile.in
Normal file
45
content/xbl/builtin/mac/Makefile.in
Normal file
@ -0,0 +1,45 @@
|
||||
#
|
||||
# ***** 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.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Jonas Sicking.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2005
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of 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
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
2
content/xbl/builtin/mac/jar.mn
Executable file
2
content/xbl/builtin/mac/jar.mn
Executable file
@ -0,0 +1,2 @@
|
||||
toolkit.jar:
|
||||
* content/global/platformHTMLBindings.xml (platformHTMLBindings.xml)
|
1
content/xbl/builtin/unix/.cvsignore
Normal file
1
content/xbl/builtin/unix/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
45
content/xbl/builtin/unix/Makefile.in
Normal file
45
content/xbl/builtin/unix/Makefile.in
Normal file
@ -0,0 +1,45 @@
|
||||
#
|
||||
# ***** 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.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Jonas Sicking.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2005
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of 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
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
2
content/xbl/builtin/unix/jar.mn
Executable file
2
content/xbl/builtin/unix/jar.mn
Executable file
@ -0,0 +1,2 @@
|
||||
toolkit.jar:
|
||||
* content/global/platformHTMLBindings.xml (platformHTMLBindings.xml)
|
1
content/xbl/builtin/win/.cvsignore
Normal file
1
content/xbl/builtin/win/.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
Makefile
|
45
content/xbl/builtin/win/Makefile.in
Normal file
45
content/xbl/builtin/win/Makefile.in
Normal file
@ -0,0 +1,45 @@
|
||||
#
|
||||
# ***** 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.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Jonas Sicking.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2005
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of 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
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
2
content/xbl/builtin/win/jar.mn
Executable file
2
content/xbl/builtin/win/jar.mn
Executable file
@ -0,0 +1,2 @@
|
||||
toolkit.jar:
|
||||
* content/global/platformHTMLBindings.xml (platformHTMLBindings.xml)
|
@ -67,6 +67,7 @@
|
||||
#include "nsXULAtoms.h"
|
||||
#include "nsIURI.h"
|
||||
#include "nsNetUtil.h"
|
||||
#include "nsContentUtils.h"
|
||||
|
||||
class nsXBLSpecialDocInfo
|
||||
{
|
||||
@ -91,10 +92,7 @@ public:
|
||||
nsXBLSpecialDocInfo() : mInitialized(PR_FALSE) {};
|
||||
};
|
||||
|
||||
const char nsXBLSpecialDocInfo::sHTMLBindingStr[] = "resource://gre/res/builtin/platformHTMLBindings.xml";
|
||||
// Allow for a userHTMLBindings.xml.
|
||||
// XXXbsmedberg Should be in the profile chrome directory, when we have a resource mapping for that
|
||||
const char nsXBLSpecialDocInfo::sUserHTMLBindingStr[] = "resource://gre/res/builtin/userHTMLBindings.xml";
|
||||
const char nsXBLSpecialDocInfo::sHTMLBindingStr[] = "chrome://global/content/platformHTMLBindings.xml";
|
||||
|
||||
void nsXBLSpecialDocInfo::LoadDocInfo()
|
||||
{
|
||||
@ -119,16 +117,19 @@ void nsXBLSpecialDocInfo::LoadDocInfo()
|
||||
PR_TRUE,
|
||||
getter_AddRefs(mHTMLBindings));
|
||||
|
||||
rv = bindingURI->SetSpec(NS_LITERAL_CSTRING(sUserHTMLBindingStr));
|
||||
if (NS_FAILED(rv)) {
|
||||
NS_ERROR("Shouldn't fail to set spec here");
|
||||
return;
|
||||
const nsAdoptingCString& userHTMLBindingStr =
|
||||
nsContentUtils::GetCharPref("dom.userHTMLBindings.uri");
|
||||
if (!userHTMLBindingStr.IsEmpty()) {
|
||||
NS_NewURI(getter_AddRefs(bindingURI), userHTMLBindingStr);
|
||||
if (!bindingURI) {
|
||||
return;
|
||||
}
|
||||
|
||||
xblService->LoadBindingDocumentInfo(nsnull, nsnull,
|
||||
bindingURI,
|
||||
PR_TRUE,
|
||||
getter_AddRefs(mUserHTMLBindings));
|
||||
}
|
||||
|
||||
xblService->LoadBindingDocumentInfo(nsnull, nsnull,
|
||||
bindingURI,
|
||||
PR_TRUE,
|
||||
getter_AddRefs(mUserHTMLBindings));
|
||||
}
|
||||
|
||||
//
|
||||
|
@ -239,7 +239,6 @@ res\arrow.gif
|
||||
res\arrowd.gif
|
||||
res\loading-image.gif
|
||||
res\broken-image.gif
|
||||
res\builtin\platformHTMLBindings.xml
|
||||
res\entityTables\html40Special.properties
|
||||
res\entityTables\htmlEntityVersions.properties
|
||||
res\entityTables\html40Latin1.properties
|
||||
|
@ -238,7 +238,6 @@ res/arrow.gif
|
||||
res/arrowd.gif
|
||||
res/loading-image.gif
|
||||
res/broken-image.gif
|
||||
res/builtin/*
|
||||
res/entityTables/html40Special.properties
|
||||
res/entityTables/htmlEntityVersions.properties
|
||||
res/entityTables/html40Latin1.properties
|
||||
|
@ -243,7 +243,6 @@ res/arrow.gif
|
||||
res/arrowd.gif
|
||||
res/loading-image.gif
|
||||
res/broken-image.gif
|
||||
res/builtin/*
|
||||
res/entityTables/html40Special.properties
|
||||
res/entityTables/htmlEntityVersion.properties
|
||||
res/entityTables/html40Latin1.properties
|
||||
|
@ -245,7 +245,6 @@ res/arrow.gif
|
||||
res/arrowd.gif
|
||||
res/loading-image.gif
|
||||
res/broken-image.gif
|
||||
res/builtin/*
|
||||
res/entityTables/html40Special.properties
|
||||
res/entityTables/htmlEntityVersion.properties
|
||||
res/entityTables/html40Latin1.properties
|
||||
|
@ -255,7 +255,6 @@ res\arrow.gif
|
||||
res\arrowd.gif
|
||||
res\loading-image.gif
|
||||
res\broken-image.gif
|
||||
res\builtin\platformHTMLBindings.xml
|
||||
res\entityTables\html40Special.properties
|
||||
res\entityTables\htmlEntityVersions.properties
|
||||
res\entityTables\html40Latin1.properties
|
||||
|
@ -189,7 +189,6 @@ res/arrow.gif
|
||||
res/arrowd.gif
|
||||
res/loading-image.gif
|
||||
res/broken-image.gif
|
||||
res/builtin/*
|
||||
res/entityTables/html40Special.properties
|
||||
res/entityTables/htmlEntityVersion.properties
|
||||
res/entityTables/html40Latin1.properties
|
||||
|
@ -187,7 +187,6 @@ res/arrow.gif
|
||||
res/arrowd.gif
|
||||
res/loading-image.gif
|
||||
res/broken-image.gif
|
||||
res/builtin/*
|
||||
res/entityTables/html40Special.properties
|
||||
res/entityTables/htmlEntityVersion.properties
|
||||
res/entityTables/html40Latin1.properties
|
||||
|
@ -39,8 +39,6 @@ dist/bin/res/arrowd.gif
|
||||
dist/bin/res/ua.css
|
||||
dist/bin/res/broken-image.gif
|
||||
dist/bin/res/loading-image.gif
|
||||
dist/bin/res/builtin/htmlBindings.xml
|
||||
dist/bin/res/builtin/platformHTMLBindings.xml
|
||||
dist/bin/res/html/gopher-audio.gif
|
||||
dist/bin/res/html/gopher-binary.gif
|
||||
dist/bin/res/html/gopher-find.gif
|
||||
|
@ -203,7 +203,7 @@ input {
|
||||
vertical-align: text-bottom;
|
||||
-moz-box-sizing: border-box;
|
||||
-moz-user-focus: normal;
|
||||
-moz-binding: url("resource://gre/res/builtin/platformHTMLBindings.xml#inputFields");
|
||||
-moz-binding: url("chrome://global/content/platformHTMLBindings.xml#inputFields");
|
||||
padding: 1px 0 1px 0;
|
||||
}
|
||||
|
||||
@ -222,7 +222,7 @@ textarea {
|
||||
vertical-align: text-bottom;
|
||||
-moz-box-sizing: border-box;
|
||||
-moz-user-focus: normal;
|
||||
-moz-binding: url("resource://gre/res/builtin/platformHTMLBindings.xml#textAreas");
|
||||
-moz-binding: url("chrome://global/content/platformHTMLBindings.xml#textAreas");
|
||||
}
|
||||
|
||||
textarea > scrollbar {
|
||||
|
@ -90,7 +90,7 @@ input {
|
||||
word-spacing: normal;
|
||||
letter-spacing: normal;
|
||||
cursor: text;
|
||||
-moz-binding: url("resource://gre/res/builtin/platformHTMLBindings.xml#inputFields");
|
||||
-moz-binding: url("chrome://global/content/platformHTMLBindings.xml#inputFields");
|
||||
text-indent: 0;
|
||||
}
|
||||
|
||||
@ -110,7 +110,7 @@ textarea {
|
||||
letter-spacing: normal;
|
||||
vertical-align: text-bottom;
|
||||
cursor: text;
|
||||
-moz-binding: url("resource://gre/res/builtin/platformHTMLBindings.xml#textAreas");
|
||||
-moz-binding: url("chrome://global/content/platformHTMLBindings.xml#textAreas");
|
||||
-moz-appearance: textfield;
|
||||
text-indent: 0;
|
||||
}
|
||||
|
@ -309,7 +309,6 @@ res\charsetalias.properties
|
||||
res\langGroups.properties
|
||||
res\language.properties
|
||||
res\os2charset.properties
|
||||
res\builtin\*
|
||||
res\entityTables\*
|
||||
|
||||
; editor resource files
|
||||
|
@ -399,7 +399,6 @@ res/charsetalias.properties
|
||||
res/langGroups.properties
|
||||
res/language.properties
|
||||
;res/wincharset.properties
|
||||
res/builtin/*
|
||||
res/entityTables/*
|
||||
|
||||
; editor resource files
|
||||
@ -454,7 +453,6 @@ components/filepicker.xpt
|
||||
;;res/arrowd.gif
|
||||
;;res/loading-image.gif
|
||||
;;res/broken-image.gif
|
||||
;;res/builtin/*
|
||||
;;res/entityTables/html40Special.properties
|
||||
;;res/entityTables/htmlEntityVersion.properties
|
||||
;;res/entityTables/html40Latin1.properties
|
||||
|
@ -331,7 +331,6 @@ bin\res\charsetalias.properties
|
||||
bin\res\langGroups.properties
|
||||
bin\res\language.properties
|
||||
bin\res\wincharset.properties
|
||||
bin\res\builtin\*
|
||||
bin\res\entityTables\*
|
||||
|
||||
; editor resource files
|
||||
|
@ -368,7 +368,6 @@ bin/res/entityTables/*
|
||||
bin/res/rdf/folder-closed.gif
|
||||
bin/res/rdf/folder-open.gif
|
||||
bin/res/rdf/loading.gif
|
||||
bin/res/builtin/platformHTMLBindings.xml
|
||||
|
||||
[mail]
|
||||
bin/msgbsutl.dll
|
||||
|
@ -270,8 +270,6 @@ bin/res/rdf/loading.gif
|
||||
bin/res/html/*
|
||||
bin/res/fonts/*
|
||||
bin/res/dtd/*
|
||||
bin/res/builtin/htmlBindings.xml
|
||||
bin/res/builtin/platformHTMLBindings.xml
|
||||
|
||||
; p3p
|
||||
bin/components/p3p.xpt
|
||||
|
@ -363,7 +363,6 @@ bin/res/rdf/loading.gif
|
||||
bin/res/html/*
|
||||
bin/res/fonts/*
|
||||
bin/res/dtd/*
|
||||
bin/res/builtin/platformHTMLBindings.xml
|
||||
|
||||
; svg
|
||||
bin/res/svg.css
|
||||
|
Loading…
Reference in New Issue
Block a user