mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

XBL syntax changes. r,a=brendan

This commit is contained in:
hyatt%netscape.com 2000-09-01 01:38:04 +00:00
Родитель 66dd081533
Коммит 2912793421
24 изменённых файлов: 500 добавлений и 368 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
content/xbl/src/nsXBLBinding.cpp
Просмотреть файл

@ -171,16 +171,17 @@ nsXBLJSClass::Destroy()
PRUint32 nsXBLBinding::gRefCnt = 0; PRUint32 nsXBLBinding::gRefCnt = 0;
nsIAtom* nsXBLBinding::kContentAtom = nsnull; nsIAtom* nsXBLBinding::kContentAtom = nsnull;
nsIAtom* nsXBLBinding::kInterfaceAtom = nsnull; nsIAtom* nsXBLBinding::kImplementationAtom = nsnull;
nsIAtom* nsXBLBinding::kHandlersAtom = nsnull; nsIAtom* nsXBLBinding::kHandlersAtom = nsnull;
nsIAtom* nsXBLBinding::kExcludesAtom = nsnull; nsIAtom* nsXBLBinding::kExcludesAtom = nsnull;
nsIAtom* nsXBLBinding::kIncludesAtom = nsnull; nsIAtom* nsXBLBinding::kIncludesAtom = nsnull;
nsIAtom* nsXBLBinding::kInheritsAtom = nsnull; nsIAtom* nsXBLBinding::kInheritsAtom = nsnull;
nsIAtom* nsXBLBinding::kTypeAtom = nsnull; nsIAtom* nsXBLBinding::kEventAtom = nsnull;
nsIAtom* nsXBLBinding::kCapturerAtom = nsnull; nsIAtom* nsXBLBinding::kPhaseAtom = nsnull;
nsIAtom* nsXBLBinding::kExtendsAtom = nsnull; nsIAtom* nsXBLBinding::kExtendsAtom = nsnull;
nsIAtom* nsXBLBinding::kChildrenAtom = nsnull; nsIAtom* nsXBLBinding::kChildrenAtom = nsnull;
nsIAtom* nsXBLBinding::kValueAtom = nsnull; nsIAtom* nsXBLBinding::kValueAtom = nsnull;
nsIAtom* nsXBLBinding::kActionAtom = nsnull;
nsIAtom* nsXBLBinding::kHTMLAtom = nsnull; nsIAtom* nsXBLBinding::kHTMLAtom = nsnull;
nsIAtom* nsXBLBinding::kMethodAtom = nsnull; nsIAtom* nsXBLBinding::kMethodAtom = nsnull;
nsIAtom* nsXBLBinding::kArgumentAtom = nsnull; nsIAtom* nsXBLBinding::kArgumentAtom = nsnull;
@ -282,17 +283,18 @@ nsXBLBinding::nsXBLBinding(const nsCString& aDocURI, const nsCString& aID)
kPool.Init("XBL Attribute Entries", kBucketSizes, kNumBuckets, kInitialSize); kPool.Init("XBL Attribute Entries", kBucketSizes, kNumBuckets, kInitialSize);
kContentAtom = NS_NewAtom("content"); kContentAtom = NS_NewAtom("content");
kInterfaceAtom = NS_NewAtom("interface"); kImplementationAtom = NS_NewAtom("implementation");
kHandlersAtom = NS_NewAtom("handlers"); kHandlersAtom = NS_NewAtom("handlers");
kExcludesAtom = NS_NewAtom("excludes"); kExcludesAtom = NS_NewAtom("excludes");
kIncludesAtom = NS_NewAtom("includes"); kIncludesAtom = NS_NewAtom("includes");
kInheritsAtom = NS_NewAtom("inherits"); kInheritsAtom = NS_NewAtom("inherits");
kTypeAtom = NS_NewAtom("type"); kEventAtom = NS_NewAtom("event");
kCapturerAtom = NS_NewAtom("capturer"); kPhaseAtom = NS_NewAtom("phase");
kExtendsAtom = NS_NewAtom("extends"); kExtendsAtom = NS_NewAtom("extends");
kChildrenAtom = NS_NewAtom("children"); kChildrenAtom = NS_NewAtom("children");
kHTMLAtom = NS_NewAtom("html"); kHTMLAtom = NS_NewAtom("html");
kValueAtom = NS_NewAtom("value"); kValueAtom = NS_NewAtom("value");
kActionAtom = NS_NewAtom("action");
kMethodAtom = NS_NewAtom("method"); kMethodAtom = NS_NewAtom("method");
kArgumentAtom = NS_NewAtom("argument"); kArgumentAtom = NS_NewAtom("argument");
kBodyAtom = NS_NewAtom("body"); kBodyAtom = NS_NewAtom("body");
@ -330,17 +332,18 @@ nsXBLBinding::~nsXBLBinding(void)
if (gRefCnt == 0) { if (gRefCnt == 0) {
NS_RELEASE(kContentAtom); NS_RELEASE(kContentAtom);
NS_RELEASE(kInterfaceAtom); NS_RELEASE(kImplementationAtom);
NS_RELEASE(kHandlersAtom); NS_RELEASE(kHandlersAtom);
NS_RELEASE(kExcludesAtom); NS_RELEASE(kExcludesAtom);
NS_RELEASE(kIncludesAtom); NS_RELEASE(kIncludesAtom);
NS_RELEASE(kInheritsAtom); NS_RELEASE(kInheritsAtom);
NS_RELEASE(kTypeAtom); NS_RELEASE(kEventAtom);
NS_RELEASE(kCapturerAtom); NS_RELEASE(kPhaseAtom);
NS_RELEASE(kExtendsAtom); NS_RELEASE(kExtendsAtom);
NS_RELEASE(kChildrenAtom); NS_RELEASE(kChildrenAtom);
NS_RELEASE(kHTMLAtom); NS_RELEASE(kHTMLAtom);
NS_RELEASE(kValueAtom); NS_RELEASE(kValueAtom);
NS_RELEASE(kActionAtom);
NS_RELEASE(kMethodAtom); NS_RELEASE(kMethodAtom);
NS_RELEASE(kArgumentAtom); NS_RELEASE(kArgumentAtom);
NS_RELEASE(kBodyAtom); NS_RELEASE(kBodyAtom);
@ -587,7 +590,7 @@ nsXBLBinding::InstallEventHandlers(nsIContent* aBoundElement, nsIXBLBinding** aB
// Fetch the type attribute. // Fetch the type attribute.
// XXX Deal with a comma-separated list of types // XXX Deal with a comma-separated list of types
nsAutoString type; nsAutoString type;
child->GetAttribute(kNameSpaceID_None, kTypeAtom, type); child->GetAttribute(kNameSpaceID_None, kEventAtom, type);
if (!type.IsEmpty()) { if (!type.IsEmpty()) {
nsIID iid; nsIID iid;
@ -643,8 +646,8 @@ nsXBLBinding::InstallEventHandlers(nsIContent* aBoundElement, nsIXBLBinding** aB
// Figure out if we're using capturing or not. // Figure out if we're using capturing or not.
PRBool useCapture = PR_FALSE; PRBool useCapture = PR_FALSE;
nsAutoString capturer; nsAutoString capturer;
child->GetAttribute(kNameSpaceID_None, kCapturerAtom, capturer); child->GetAttribute(kNameSpaceID_None, kPhaseAtom, capturer);
if (capturer == NS_LITERAL_STRING("true")) if (capturer == NS_LITERAL_STRING("capturing"))
useCapture = PR_TRUE; useCapture = PR_TRUE;
// Add the event listener. // Add the event listener.
@ -665,8 +668,9 @@ nsXBLBinding::InstallEventHandlers(nsIContent* aBoundElement, nsIXBLBinding** aB
else { else {
// Call AddScriptEventListener for other IID types // Call AddScriptEventListener for other IID types
// XXX Want this to all go away! // XXX Want this to all go away!
NS_WARNING("***** Non-compliant XBL event listener attached! *****");
nsAutoString value; nsAutoString value;
child->GetAttribute(kNameSpaceID_None, kValueAtom, value); child->GetAttribute(kNameSpaceID_None, kActionAtom, value);
if (value.IsEmpty()) if (value.IsEmpty())
GetTextData(child, value); GetTextData(child, value);
@ -701,7 +705,7 @@ nsXBLBinding::InstallProperties(nsIContent* aBoundElement)
// Fetch the interface element for this binding. // Fetch the interface element for this binding.
nsCOMPtr<nsIContent> interfaceElement; nsCOMPtr<nsIContent> interfaceElement;
GetImmediateChild(kInterfaceAtom, getter_AddRefs(interfaceElement)); GetImmediateChild(kImplementationAtom, getter_AddRefs(interfaceElement));
if (interfaceElement && AllowScripts()) { if (interfaceElement && AllowScripts()) {
// Get our bound element's script context. // Get our bound element's script context.
@ -1123,7 +1127,7 @@ nsXBLBinding::ChangeDocument(nsIDocument* aOldDocument, nsIDocument* aNewDocumen
if (mIsStyleBinding) { if (mIsStyleBinding) {
// Now the binding dies. Unhook our prototypes. // Now the binding dies. Unhook our prototypes.
nsCOMPtr<nsIContent> interfaceElement; nsCOMPtr<nsIContent> interfaceElement;
GetImmediateChild(kInterfaceAtom, getter_AddRefs(interfaceElement)); GetImmediateChild(kImplementationAtom, getter_AddRefs(interfaceElement));
if (interfaceElement) { if (interfaceElement) {
nsCOMPtr<nsIScriptGlobalObject> global; nsCOMPtr<nsIScriptGlobalObject> global;

7
content/xbl/src/nsXBLBinding.h
Просмотреть файл

@ -103,13 +103,13 @@ public:
static PRUint32 gRefCnt; static PRUint32 gRefCnt;
static nsIAtom* kContentAtom; static nsIAtom* kContentAtom;
static nsIAtom* kInterfaceAtom; static nsIAtom* kImplementationAtom;
static nsIAtom* kHandlersAtom; static nsIAtom* kHandlersAtom;
static nsIAtom* kExcludesAtom; static nsIAtom* kExcludesAtom;
static nsIAtom* kIncludesAtom; static nsIAtom* kIncludesAtom;
static nsIAtom* kInheritsAtom; static nsIAtom* kInheritsAtom;
static nsIAtom* kTypeAtom; static nsIAtom* kEventAtom;
static nsIAtom* kCapturerAtom; static nsIAtom* kPhaseAtom;
static nsIAtom* kExtendsAtom; static nsIAtom* kExtendsAtom;
static nsIAtom* kChildrenAtom; static nsIAtom* kChildrenAtom;
static nsIAtom* kMethodAtom; static nsIAtom* kMethodAtom;
@ -122,6 +122,7 @@ public:
static nsIAtom* kSetterAtom; static nsIAtom* kSetterAtom;
static nsIAtom* kHTMLAtom; static nsIAtom* kHTMLAtom;
static nsIAtom* kValueAtom; static nsIAtom* kValueAtom;
static nsIAtom* kActionAtom;
static nsIAtom* kNameAtom; static nsIAtom* kNameAtom;
static nsIAtom* kReadOnlyAtom; static nsIAtom* kReadOnlyAtom;
static nsIAtom* kAttachToAtom; static nsIAtom* kAttachToAtom;

14
content/xbl/src/nsXBLEventHandler.cpp
Просмотреть файл

@ -59,7 +59,7 @@ nsIAtom* nsXBLEventHandler::kShiftAtom = nsnull;
nsIAtom* nsXBLEventHandler::kControlAtom = nsnull; nsIAtom* nsXBLEventHandler::kControlAtom = nsnull;
nsIAtom* nsXBLEventHandler::kMetaAtom = nsnull; nsIAtom* nsXBLEventHandler::kMetaAtom = nsnull;
nsIAtom* nsXBLEventHandler::kAltAtom = nsnull; nsIAtom* nsXBLEventHandler::kAltAtom = nsnull;
nsIAtom* nsXBLEventHandler::kValueAtom = nsnull; nsIAtom* nsXBLEventHandler::kActionAtom = nsnull;
nsIAtom* nsXBLEventHandler::kCommandAtom = nsnull; nsIAtom* nsXBLEventHandler::kCommandAtom = nsnull;
nsIAtom* nsXBLEventHandler::kClickCountAtom = nsnull; nsIAtom* nsXBLEventHandler::kClickCountAtom = nsnull;
nsIAtom* nsXBLEventHandler::kButtonAtom = nsnull; nsIAtom* nsXBLEventHandler::kButtonAtom = nsnull;
@ -85,7 +85,7 @@ nsXBLEventHandler::nsXBLEventHandler(nsIContent* aBoundElement, nsIContent* aHan
kControlAtom = NS_NewAtom("control"); kControlAtom = NS_NewAtom("control");
kAltAtom = NS_NewAtom("alt"); kAltAtom = NS_NewAtom("alt");
kMetaAtom = NS_NewAtom("meta"); kMetaAtom = NS_NewAtom("meta");
kValueAtom = NS_NewAtom("value"); kActionAtom = NS_NewAtom("action");
kCommandAtom = NS_NewAtom("command"); kCommandAtom = NS_NewAtom("command");
kClickCountAtom = NS_NewAtom("clickcount"); kClickCountAtom = NS_NewAtom("clickcount");
kButtonAtom = NS_NewAtom("button"); kButtonAtom = NS_NewAtom("button");
@ -106,7 +106,7 @@ nsXBLEventHandler::~nsXBLEventHandler()
NS_RELEASE(kControlAtom); NS_RELEASE(kControlAtom);
NS_RELEASE(kAltAtom); NS_RELEASE(kAltAtom);
NS_RELEASE(kMetaAtom); NS_RELEASE(kMetaAtom);
NS_RELEASE(kValueAtom); NS_RELEASE(kActionAtom);
NS_RELEASE(kCommandAtom); NS_RELEASE(kCommandAtom);
NS_RELEASE(kButtonAtom); NS_RELEASE(kButtonAtom);
NS_RELEASE(kClickCountAtom); NS_RELEASE(kClickCountAtom);
@ -690,7 +690,7 @@ nsXBLEventHandler::ExecuteHandler(const nsAReadableString & aEventName, nsIDOMEv
// Compile the event handler. // Compile the event handler.
nsAutoString handlerText; nsAutoString handlerText;
mHandlerElement->GetAttribute(kNameSpaceID_None, kValueAtom, handlerText); mHandlerElement->GetAttribute(kNameSpaceID_None, kActionAtom, handlerText);
if (handlerText.IsEmpty()) { if (handlerText.IsEmpty()) {
// look to see if action content is contained by the handler element // look to see if action content is contained by the handler element
GetTextData(mHandlerElement, handlerText); GetTextData(mHandlerElement, handlerText);
@ -785,13 +785,13 @@ nsXBLEventHandler::RemoveEventHandlers()
// Figure out if we're using capturing or not. // Figure out if we're using capturing or not.
PRBool useCapture = PR_FALSE; PRBool useCapture = PR_FALSE;
nsAutoString capturer; nsAutoString capturer;
mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kCapturerAtom, capturer); mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kPhaseAtom, capturer);
if (capturer == NS_LITERAL_STRING("true")) if (capturer == NS_LITERAL_STRING("capturing"))
useCapture = PR_TRUE; useCapture = PR_TRUE;
// XXX Will potentially be comma-separated // XXX Will potentially be comma-separated
nsAutoString type; nsAutoString type;
mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kTypeAtom, type); mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kEventAtom, type);
// Figure out our type. // Figure out our type.
PRBool mouse = nsXBLBinding::IsMouseHandler(type); PRBool mouse = nsXBLBinding::IsMouseHandler(type);

2
content/xbl/src/nsXBLEventHandler.h
Просмотреть файл

@ -116,7 +116,7 @@ protected:
static nsIAtom* kControlAtom; static nsIAtom* kControlAtom;
static nsIAtom* kAltAtom; static nsIAtom* kAltAtom;
static nsIAtom* kMetaAtom; static nsIAtom* kMetaAtom;
static nsIAtom* kValueAtom; static nsIAtom* kActionAtom;
static nsIAtom* kCommandAtom; static nsIAtom* kCommandAtom;
static nsIAtom* kClickCountAtom; static nsIAtom* kClickCountAtom;
static nsIAtom* kButtonAtom; static nsIAtom* kButtonAtom;

34
layout/xbl/src/nsXBLBinding.cpp
Просмотреть файл

@ -171,16 +171,17 @@ nsXBLJSClass::Destroy()
PRUint32 nsXBLBinding::gRefCnt = 0; PRUint32 nsXBLBinding::gRefCnt = 0;
nsIAtom* nsXBLBinding::kContentAtom = nsnull; nsIAtom* nsXBLBinding::kContentAtom = nsnull;
nsIAtom* nsXBLBinding::kInterfaceAtom = nsnull; nsIAtom* nsXBLBinding::kImplementationAtom = nsnull;
nsIAtom* nsXBLBinding::kHandlersAtom = nsnull; nsIAtom* nsXBLBinding::kHandlersAtom = nsnull;
nsIAtom* nsXBLBinding::kExcludesAtom = nsnull; nsIAtom* nsXBLBinding::kExcludesAtom = nsnull;
nsIAtom* nsXBLBinding::kIncludesAtom = nsnull; nsIAtom* nsXBLBinding::kIncludesAtom = nsnull;
nsIAtom* nsXBLBinding::kInheritsAtom = nsnull; nsIAtom* nsXBLBinding::kInheritsAtom = nsnull;
nsIAtom* nsXBLBinding::kTypeAtom = nsnull; nsIAtom* nsXBLBinding::kEventAtom = nsnull;
nsIAtom* nsXBLBinding::kCapturerAtom = nsnull; nsIAtom* nsXBLBinding::kPhaseAtom = nsnull;
nsIAtom* nsXBLBinding::kExtendsAtom = nsnull; nsIAtom* nsXBLBinding::kExtendsAtom = nsnull;
nsIAtom* nsXBLBinding::kChildrenAtom = nsnull; nsIAtom* nsXBLBinding::kChildrenAtom = nsnull;
nsIAtom* nsXBLBinding::kValueAtom = nsnull; nsIAtom* nsXBLBinding::kValueAtom = nsnull;
nsIAtom* nsXBLBinding::kActionAtom = nsnull;
nsIAtom* nsXBLBinding::kHTMLAtom = nsnull; nsIAtom* nsXBLBinding::kHTMLAtom = nsnull;
nsIAtom* nsXBLBinding::kMethodAtom = nsnull; nsIAtom* nsXBLBinding::kMethodAtom = nsnull;
nsIAtom* nsXBLBinding::kArgumentAtom = nsnull; nsIAtom* nsXBLBinding::kArgumentAtom = nsnull;
@ -282,17 +283,18 @@ nsXBLBinding::nsXBLBinding(const nsCString& aDocURI, const nsCString& aID)
kPool.Init("XBL Attribute Entries", kBucketSizes, kNumBuckets, kInitialSize); kPool.Init("XBL Attribute Entries", kBucketSizes, kNumBuckets, kInitialSize);
kContentAtom = NS_NewAtom("content"); kContentAtom = NS_NewAtom("content");
kInterfaceAtom = NS_NewAtom("interface"); kImplementationAtom = NS_NewAtom("implementation");
kHandlersAtom = NS_NewAtom("handlers"); kHandlersAtom = NS_NewAtom("handlers");
kExcludesAtom = NS_NewAtom("excludes"); kExcludesAtom = NS_NewAtom("excludes");
kIncludesAtom = NS_NewAtom("includes"); kIncludesAtom = NS_NewAtom("includes");
kInheritsAtom = NS_NewAtom("inherits"); kInheritsAtom = NS_NewAtom("inherits");
kTypeAtom = NS_NewAtom("type"); kEventAtom = NS_NewAtom("event");
kCapturerAtom = NS_NewAtom("capturer"); kPhaseAtom = NS_NewAtom("phase");
kExtendsAtom = NS_NewAtom("extends"); kExtendsAtom = NS_NewAtom("extends");
kChildrenAtom = NS_NewAtom("children"); kChildrenAtom = NS_NewAtom("children");
kHTMLAtom = NS_NewAtom("html"); kHTMLAtom = NS_NewAtom("html");
kValueAtom = NS_NewAtom("value"); kValueAtom = NS_NewAtom("value");
kActionAtom = NS_NewAtom("action");
kMethodAtom = NS_NewAtom("method"); kMethodAtom = NS_NewAtom("method");
kArgumentAtom = NS_NewAtom("argument"); kArgumentAtom = NS_NewAtom("argument");
kBodyAtom = NS_NewAtom("body"); kBodyAtom = NS_NewAtom("body");
@ -330,17 +332,18 @@ nsXBLBinding::~nsXBLBinding(void)
if (gRefCnt == 0) { if (gRefCnt == 0) {
NS_RELEASE(kContentAtom); NS_RELEASE(kContentAtom);
NS_RELEASE(kInterfaceAtom); NS_RELEASE(kImplementationAtom);
NS_RELEASE(kHandlersAtom); NS_RELEASE(kHandlersAtom);
NS_RELEASE(kExcludesAtom); NS_RELEASE(kExcludesAtom);
NS_RELEASE(kIncludesAtom); NS_RELEASE(kIncludesAtom);
NS_RELEASE(kInheritsAtom); NS_RELEASE(kInheritsAtom);
NS_RELEASE(kTypeAtom); NS_RELEASE(kEventAtom);
NS_RELEASE(kCapturerAtom); NS_RELEASE(kPhaseAtom);
NS_RELEASE(kExtendsAtom); NS_RELEASE(kExtendsAtom);
NS_RELEASE(kChildrenAtom); NS_RELEASE(kChildrenAtom);
NS_RELEASE(kHTMLAtom); NS_RELEASE(kHTMLAtom);
NS_RELEASE(kValueAtom); NS_RELEASE(kValueAtom);
NS_RELEASE(kActionAtom);
NS_RELEASE(kMethodAtom); NS_RELEASE(kMethodAtom);
NS_RELEASE(kArgumentAtom); NS_RELEASE(kArgumentAtom);
NS_RELEASE(kBodyAtom); NS_RELEASE(kBodyAtom);
@ -587,7 +590,7 @@ nsXBLBinding::InstallEventHandlers(nsIContent* aBoundElement, nsIXBLBinding** aB
// Fetch the type attribute. // Fetch the type attribute.
// XXX Deal with a comma-separated list of types // XXX Deal with a comma-separated list of types
nsAutoString type; nsAutoString type;
child->GetAttribute(kNameSpaceID_None, kTypeAtom, type); child->GetAttribute(kNameSpaceID_None, kEventAtom, type);
if (!type.IsEmpty()) { if (!type.IsEmpty()) {
nsIID iid; nsIID iid;
@ -643,8 +646,8 @@ nsXBLBinding::InstallEventHandlers(nsIContent* aBoundElement, nsIXBLBinding** aB
// Figure out if we're using capturing or not. // Figure out if we're using capturing or not.
PRBool useCapture = PR_FALSE; PRBool useCapture = PR_FALSE;
nsAutoString capturer; nsAutoString capturer;
child->GetAttribute(kNameSpaceID_None, kCapturerAtom, capturer); child->GetAttribute(kNameSpaceID_None, kPhaseAtom, capturer);
if (capturer == NS_LITERAL_STRING("true")) if (capturer == NS_LITERAL_STRING("capturing"))
useCapture = PR_TRUE; useCapture = PR_TRUE;
// Add the event listener. // Add the event listener.
@ -665,8 +668,9 @@ nsXBLBinding::InstallEventHandlers(nsIContent* aBoundElement, nsIXBLBinding** aB
else { else {
// Call AddScriptEventListener for other IID types // Call AddScriptEventListener for other IID types
// XXX Want this to all go away! // XXX Want this to all go away!
NS_WARNING("***** Non-compliant XBL event listener attached! *****");
nsAutoString value; nsAutoString value;
child->GetAttribute(kNameSpaceID_None, kValueAtom, value); child->GetAttribute(kNameSpaceID_None, kActionAtom, value);
if (value.IsEmpty()) if (value.IsEmpty())
GetTextData(child, value); GetTextData(child, value);
@ -701,7 +705,7 @@ nsXBLBinding::InstallProperties(nsIContent* aBoundElement)
// Fetch the interface element for this binding. // Fetch the interface element for this binding.
nsCOMPtr<nsIContent> interfaceElement; nsCOMPtr<nsIContent> interfaceElement;
GetImmediateChild(kInterfaceAtom, getter_AddRefs(interfaceElement)); GetImmediateChild(kImplementationAtom, getter_AddRefs(interfaceElement));
if (interfaceElement && AllowScripts()) { if (interfaceElement && AllowScripts()) {
// Get our bound element's script context. // Get our bound element's script context.
@ -1123,7 +1127,7 @@ nsXBLBinding::ChangeDocument(nsIDocument* aOldDocument, nsIDocument* aNewDocumen
if (mIsStyleBinding) { if (mIsStyleBinding) {
// Now the binding dies. Unhook our prototypes. // Now the binding dies. Unhook our prototypes.
nsCOMPtr<nsIContent> interfaceElement; nsCOMPtr<nsIContent> interfaceElement;
GetImmediateChild(kInterfaceAtom, getter_AddRefs(interfaceElement)); GetImmediateChild(kImplementationAtom, getter_AddRefs(interfaceElement));
if (interfaceElement) { if (interfaceElement) {
nsCOMPtr<nsIScriptGlobalObject> global; nsCOMPtr<nsIScriptGlobalObject> global;

7
layout/xbl/src/nsXBLBinding.h
Просмотреть файл

@ -103,13 +103,13 @@ public:
static PRUint32 gRefCnt; static PRUint32 gRefCnt;
static nsIAtom* kContentAtom; static nsIAtom* kContentAtom;
static nsIAtom* kInterfaceAtom; static nsIAtom* kImplementationAtom;
static nsIAtom* kHandlersAtom; static nsIAtom* kHandlersAtom;
static nsIAtom* kExcludesAtom; static nsIAtom* kExcludesAtom;
static nsIAtom* kIncludesAtom; static nsIAtom* kIncludesAtom;
static nsIAtom* kInheritsAtom; static nsIAtom* kInheritsAtom;
static nsIAtom* kTypeAtom; static nsIAtom* kEventAtom;
static nsIAtom* kCapturerAtom; static nsIAtom* kPhaseAtom;
static nsIAtom* kExtendsAtom; static nsIAtom* kExtendsAtom;
static nsIAtom* kChildrenAtom; static nsIAtom* kChildrenAtom;
static nsIAtom* kMethodAtom; static nsIAtom* kMethodAtom;
@ -122,6 +122,7 @@ public:
static nsIAtom* kSetterAtom; static nsIAtom* kSetterAtom;
static nsIAtom* kHTMLAtom; static nsIAtom* kHTMLAtom;
static nsIAtom* kValueAtom; static nsIAtom* kValueAtom;
static nsIAtom* kActionAtom;
static nsIAtom* kNameAtom; static nsIAtom* kNameAtom;
static nsIAtom* kReadOnlyAtom; static nsIAtom* kReadOnlyAtom;
static nsIAtom* kAttachToAtom; static nsIAtom* kAttachToAtom;

14
layout/xbl/src/nsXBLEventHandler.cpp
Просмотреть файл

@ -59,7 +59,7 @@ nsIAtom* nsXBLEventHandler::kShiftAtom = nsnull;
nsIAtom* nsXBLEventHandler::kControlAtom = nsnull; nsIAtom* nsXBLEventHandler::kControlAtom = nsnull;
nsIAtom* nsXBLEventHandler::kMetaAtom = nsnull; nsIAtom* nsXBLEventHandler::kMetaAtom = nsnull;
nsIAtom* nsXBLEventHandler::kAltAtom = nsnull; nsIAtom* nsXBLEventHandler::kAltAtom = nsnull;
nsIAtom* nsXBLEventHandler::kValueAtom = nsnull; nsIAtom* nsXBLEventHandler::kActionAtom = nsnull;
nsIAtom* nsXBLEventHandler::kCommandAtom = nsnull; nsIAtom* nsXBLEventHandler::kCommandAtom = nsnull;
nsIAtom* nsXBLEventHandler::kClickCountAtom = nsnull; nsIAtom* nsXBLEventHandler::kClickCountAtom = nsnull;
nsIAtom* nsXBLEventHandler::kButtonAtom = nsnull; nsIAtom* nsXBLEventHandler::kButtonAtom = nsnull;
@ -85,7 +85,7 @@ nsXBLEventHandler::nsXBLEventHandler(nsIContent* aBoundElement, nsIContent* aHan
kControlAtom = NS_NewAtom("control"); kControlAtom = NS_NewAtom("control");
kAltAtom = NS_NewAtom("alt"); kAltAtom = NS_NewAtom("alt");
kMetaAtom = NS_NewAtom("meta"); kMetaAtom = NS_NewAtom("meta");
kValueAtom = NS_NewAtom("value"); kActionAtom = NS_NewAtom("action");
kCommandAtom = NS_NewAtom("command"); kCommandAtom = NS_NewAtom("command");
kClickCountAtom = NS_NewAtom("clickcount"); kClickCountAtom = NS_NewAtom("clickcount");
kButtonAtom = NS_NewAtom("button"); kButtonAtom = NS_NewAtom("button");
@ -106,7 +106,7 @@ nsXBLEventHandler::~nsXBLEventHandler()
NS_RELEASE(kControlAtom); NS_RELEASE(kControlAtom);
NS_RELEASE(kAltAtom); NS_RELEASE(kAltAtom);
NS_RELEASE(kMetaAtom); NS_RELEASE(kMetaAtom);
NS_RELEASE(kValueAtom); NS_RELEASE(kActionAtom);
NS_RELEASE(kCommandAtom); NS_RELEASE(kCommandAtom);
NS_RELEASE(kButtonAtom); NS_RELEASE(kButtonAtom);
NS_RELEASE(kClickCountAtom); NS_RELEASE(kClickCountAtom);
@ -690,7 +690,7 @@ nsXBLEventHandler::ExecuteHandler(const nsAReadableString & aEventName, nsIDOMEv
// Compile the event handler. // Compile the event handler.
nsAutoString handlerText; nsAutoString handlerText;
mHandlerElement->GetAttribute(kNameSpaceID_None, kValueAtom, handlerText); mHandlerElement->GetAttribute(kNameSpaceID_None, kActionAtom, handlerText);
if (handlerText.IsEmpty()) { if (handlerText.IsEmpty()) {
// look to see if action content is contained by the handler element // look to see if action content is contained by the handler element
GetTextData(mHandlerElement, handlerText); GetTextData(mHandlerElement, handlerText);
@ -785,13 +785,13 @@ nsXBLEventHandler::RemoveEventHandlers()
// Figure out if we're using capturing or not. // Figure out if we're using capturing or not.
PRBool useCapture = PR_FALSE; PRBool useCapture = PR_FALSE;
nsAutoString capturer; nsAutoString capturer;
mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kCapturerAtom, capturer); mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kPhaseAtom, capturer);
if (capturer == NS_LITERAL_STRING("true")) if (capturer == NS_LITERAL_STRING("capturing"))
useCapture = PR_TRUE; useCapture = PR_TRUE;
// XXX Will potentially be comma-separated // XXX Will potentially be comma-separated
nsAutoString type; nsAutoString type;
mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kTypeAtom, type); mHandlerElement->GetAttribute(kNameSpaceID_None, nsXBLBinding::kEventAtom, type);
// Figure out our type. // Figure out our type.
PRBool mouse = nsXBLBinding::IsMouseHandler(type); PRBool mouse = nsXBLBinding::IsMouseHandler(type);

2
layout/xbl/src/nsXBLEventHandler.h
Просмотреть файл

@ -116,7 +116,7 @@ protected:
static nsIAtom* kControlAtom; static nsIAtom* kControlAtom;
static nsIAtom* kAltAtom; static nsIAtom* kAltAtom;
static nsIAtom* kMetaAtom; static nsIAtom* kMetaAtom;
static nsIAtom* kValueAtom; static nsIAtom* kActionAtom;
static nsIAtom* kCommandAtom; static nsIAtom* kCommandAtom;
static nsIAtom* kClickCountAtom; static nsIAtom* kClickCountAtom;
static nsIAtom* kButtonAtom; static nsIAtom* kButtonAtom;

11
layout/xul/base/src/nsBoxFrame.cpp
Просмотреть файл

@ -1178,6 +1178,8 @@ nsBoxFrame::AttributeChanged(nsIPresContext* aPresContext,
aAttribute == nsHTMLAtoms::height || aAttribute == nsHTMLAtoms::height ||
aAttribute == nsHTMLAtoms::align || aAttribute == nsHTMLAtoms::align ||
aAttribute == nsHTMLAtoms::valign || aAttribute == nsHTMLAtoms::valign ||
aAttribute == nsHTMLAtoms::left ||
aAttribute == nsHTMLAtoms::top ||
aAttribute == nsXULAtoms::flex || aAttribute == nsXULAtoms::flex ||
aAttribute == nsXULAtoms::orient || aAttribute == nsXULAtoms::orient ||
aAttribute == nsXULAtoms::equalsize || aAttribute == nsXULAtoms::equalsize ||
@ -1854,6 +1856,7 @@ nsBoxFrame::GetInsertionPoint(nsIPresShell* aShell, nsIFrame* aParent, nsIFrame*
content->GetDocument(*getter_AddRefs(document)); content->GetDocument(*getter_AddRefs(document));
if (!document) if (!document)
return; return;
nsCOMPtr<nsIBindingManager> bindingManager; nsCOMPtr<nsIBindingManager> bindingManager;
document->GetBindingManager(getter_AddRefs(bindingManager)); document->GetBindingManager(getter_AddRefs(bindingManager));
if (!bindingManager) if (!bindingManager)
@ -1863,6 +1866,14 @@ nsBoxFrame::GetInsertionPoint(nsIPresShell* aShell, nsIFrame* aParent, nsIFrame*
if (aChild) { if (aChild) {
nsCOMPtr<nsIContent> currContent; nsCOMPtr<nsIContent> currContent;
aChild->GetContent(getter_AddRefs(currContent)); aChild->GetContent(getter_AddRefs(currContent));
// Check to see if the content is anonymous.
nsCOMPtr<nsIContent> bindingParent;
currContent->GetBindingParent(getter_AddRefs(bindingParent));
if (bindingParent == content)
return; // It is anonymous. Don't use the insertion point, since that's only
// for the explicit kids.
bindingManager->GetInsertionPoint(content, currContent, getter_AddRefs(insertionElement)); bindingManager->GetInsertionPoint(content, currContent, getter_AddRefs(insertionElement));
if (insertionElement) { if (insertionElement) {
aShell->GetPrimaryFrameFor(insertionElement, &frame); aShell->GetPrimaryFrameFor(insertionElement, &frame);

2
layout/xul/base/src/nsBoxLayoutState.cpp
Просмотреть файл

@ -156,7 +156,7 @@ nsBoxLayoutState::HandleReflow(nsIBox* aRootBox)
break; break;
case eReflowReason_StyleChange: case eReflowReason_StyleChange:
printf("STYLE CHANGE REFLOW. Blowing away all box caches!!\n"); // printf("STYLE CHANGE REFLOW. Blowing away all box caches!!\n");
aRootBox->MarkChildrenStyleChange(); aRootBox->MarkChildrenStyleChange();
// fall through to dirty // fall through to dirty

136
mailnews/base/resources/content/mailWidgets.xml
Просмотреть файл

@ -15,7 +15,7 @@
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="value" onset="return document.getAnonymousNodes(this)[0].firstChild.setAttribute('value',val);" <property name="value" onset="return document.getAnonymousNodes(this)[0].firstChild.setAttribute('value',val);"
onget="return document.getAnonymousNodes(this)[0].firstChild.getAttribute('value');"/> onget="return document.getAnonymousNodes(this)[0].firstChild.getAttribute('value');"/>
<property name="crop" onset="return document.getAnonymousNodes(this)[0].firstChild.setAttribute('crop',val);" <property name="crop" onset="return document.getAnonymousNodes(this)[0].firstChild.setAttribute('crop',val);"
@ -47,7 +47,7 @@
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding> </binding>
<binding id="search-menulist-abstract" name="searchMenulistAbstract" extends="xul:box"> <binding id="search-menulist-abstract" name="searchMenulistAbstract" extends="xul:box">
@ -57,7 +57,7 @@
</xul:menulist> </xul:menulist>
</content> </content>
<interface> <implementation>
<property readonly="true" name="validityManager"> <property readonly="true" name="validityManager">
<![CDATA[ <![CDATA[
Components.classes['mozilla.mail.search.validityManager.1'].getService(Components.interfaces.nsIMsgSearchValidityManager); Components.classes['mozilla.mail.search.validityManager.1'].getService(Components.interfaces.nsIMsgSearchValidityManager);
@ -192,13 +192,13 @@
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding> </binding>
<!-- searchattribute - Subject, Sender, To, CC, etc. --> <!-- searchattribute - Subject, Sender, To, CC, etc. -->
<binding id="searchattribute" name="searchAttribute" <binding id="searchattribute" name="searchAttribute"
extends="chrome://messenger/content/mailWidgets.xml#search-menulist-abstract"> extends="chrome://messenger/content/mailWidgets.xml#search-menulist-abstract">
<interface> <implementation>
<property name="stringBundle"> <property name="stringBundle">
<![CDATA[ <![CDATA[
srGetStrBundle("chrome://messenger/locale/search-attributes.properties"); srGetStrBundle("chrome://messenger/locale/search-attributes.properties");
@ -212,13 +212,13 @@
]]> ]]>
</getter> </getter>
</property> </property>
</interface> </implementation>
</binding> </binding>
<!-- searchoperator - Contains, Is Less than, etc --> <!-- searchoperator - Contains, Is Less than, etc -->
<binding id="searchoperator" name="searchOperator" <binding id="searchoperator" name="searchOperator"
extends="chrome://messenger/content/mailWidgets.xml#search-menulist-abstract"> extends="chrome://messenger/content/mailWidgets.xml#search-menulist-abstract">
<interface> <implementation>
<property name="stringBundle"> <property name="stringBundle">
<![CDATA[ <![CDATA[
srGetStrBundle("chrome://messenger/locale/search-operators.properties"); srGetStrBundle("chrome://messenger/locale/search-operators.properties");
@ -248,7 +248,7 @@
]]> ]]>
</getter> </getter>
</property> </property>
</interface> </implementation>
</binding> </binding>
<!-- searchvalue - a widget which dynamically changes it's user interface <!-- searchvalue - a widget which dynamically changes it's user interface
@ -276,7 +276,7 @@
</xul:menupopup> </xul:menupopup>
</xul:menulist> </xul:menulist>
</content> </content>
<interface> <implementation>
<!-- parentValue forwards to the attribute --> <!-- parentValue forwards to the attribute -->
<property name="parentValue" onset="return this.searchAttribute=val;" <property name="parentValue" onset="return this.searchAttribute=val;"
onget="return this.searchAttribute;"/> onget="return this.searchAttribute;"/>
@ -361,6 +361,122 @@
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding>
<binding id="searchterm" name="searchTerm" extends="xul:box">
<implementation>
<!-- the actual nsIMsgSearchTerm object -->
<property name="searchTerm" onget="return this.internalSearchTerm">
<setter>
<![CDATA[
this.internalSearchTerm = val;
var term = val;
// val is a nsIMsgSearchTerm
var searchAttribute=this.searchattribute;
var searchOperator=this.searchoperator;
var searchValue=this.searchvalue;
// now reflect all attributes of the searchterm into the widgets
if (searchAttribute) searchAttribute.value = term.attrib;
if (searchOperator) searchOperator.value = val.op;
if (searchValue) searchValue.value = term.value;
this.booleanAnd = val.booleanAnd;
]]>
</setter>
</property>
<property name="searchScope">
<getter>
<![CDATA[
var searchAttribute = this.searchattribute;
if (searchAttribute)
return searchAttribute.searchScope;
return undefined;
]]>
</getter>
<setter>
<![CDATA[
var searchAttribute = this.searchattribute;
if (searchAttribute) searchAttribute.searchScope=val;
]]>
</setter>
</property>
<!-- the three tags that make up a term - to use, set the
attribute in the XUL to the ID of the term.
-->
<property name="searchattribute"
onget="return document.getElementById(this.getAttribute('searchattribute'));"
onset="this.setAttribute('searchattribute',val.id)"/>
<property name="searchoperator"
onget="return document.getElementById(this.getAttribute('searchoperator'));"
onset="this.setAttribute('searchoperator',val.id)"/>
<property name="searchvalue"
onget="return document.getElementById(this.getAttribute('searchvalue'));"
onset="this.setAttribute('searchvalue',val.id)"/>
<property name="booleanNodes">
<![CDATA[
null;
]]>
</property>
<property name="stringBundle">
<![CDATA[
srGetStrBundle("chrome://messenger/locale/search.properties");
]]>
</property>
<property name="booleanAnd" onget="return this.internalBooleanAnd">
<setter>
<![CDATA[
// whenever you set this, all nodes in booleanNodes
// are updated to reflect the string
if (this.internalBooleanAnd == val) return;
this.internalBooleanAnd = val;
var booleanNodes = this.booleanNodes;
if (!booleanNodes) return;
var stringBundle = this.stringBundle;
var andString = val ? "And" : "Or";
for (var i=0; i<booleanNodes.length; i++) {
try {
var staticString =
stringBundle.GetStringFromName("search" + andString + i);
if (staticString && staticString.length>0)
booleanNodes[i].setAttribute("value", staticString);
} catch (ex) { /* no error, means string not found */}
}
]]>
</setter>
</property>
<method name="save">
<body>
<![CDATA[
var searchTerm = this.searchTerm;
searchTerm.attrib = this.searchattribute.value;
searchTerm.op = this.searchoperator.value;
if (this.searchvalue.value)
this.searchvalue.save();
else
this.searchvalue.saveTo(searchTerm.value);
searchTerm.value = this.searchvalue.value;
searchTerm.booleanAnd = this.booleanAnd;
]]>
</body>
</method>
<!-- if you have a search term element with no search term -->
<method name="saveTo">
<argument name="searchTerm"/>
<body>
<![CDATA[
this.internalSearchTerm = searchTerm;
this.save();
]]>
</body>
</method>
</implementation>
</binding> </binding>
</bindings> </bindings>

16
xpfe/components/autocomplete/resources/content/autocomplete.xml
Просмотреть файл

@ -18,7 +18,7 @@
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="value" <property name="value"
onset=" onset="
if (this.ignoreInputEventTimer) if (this.ignoreInputEventTimer)
@ -418,15 +418,15 @@
]]> ]]>
</property> </property>
</interface> </implementation>
<handlers> <handlers>
<handler type="click" value="this.privatefunc.cleanupInputField(this);"/> <handler event="click" action="this.privatefunc.cleanupInputField(this);"/>
<handler type="dblclick" value="this.privatefunc.cleanupInputField(this);"/> <handler event="dblclick" action="this.privatefunc.cleanupInputField(this);"/>
<handler type="input" value="this.privatefunc.processInput(this);"/> <handler event="input" action="this.privatefunc.processInput(this);"/>
<handler type="keypress" value="this.privatefunc.processKeyPress(this, event);"/> <handler event="keypress" action="this.privatefunc.processKeyPress(this, event);"/>
<handler type="focus" value="this.needToAutocomplete = false; this.lastResults.searchString=''; this.ignoreInputEvent = false"/> <handler event="focus" action="this.needToAutocomplete = false; this.lastResults.searchString=''; this.ignoreInputEvent = false"/>
<handler type="blur" value=" <handler event="blur" action="
this.privatefunc.closePopupMenu(this); this.privatefunc.closePopupMenu(this);
if (this.needToAutocomplete) if (this.needToAutocomplete)
this.privatefunc.finishAutoComplete(this, event); this.privatefunc.finishAutoComplete(this, event);

4
xpfe/global/resources/content/dialogBindings.xml
Просмотреть файл

@ -13,12 +13,12 @@
<xul:text class="box-smallheader-right" inherits="description:value"/> <xul:text class="box-smallheader-right" inherits="description:value"/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="title" onset="this.setAttribute('title',val); return val;" <property name="title" onset="this.setAttribute('title',val); return val;"
onget="return this.getAttribute('title');"/> onget="return this.getAttribute('title');"/>
<property name="description" onset="this.setAttribute('description',val); return val;" <property name="description" onset="this.setAttribute('description',val); return val;"
onget="return this.getAttribute('description');"/> onget="return this.getAttribute('description');"/>
</interface> </implementation>
</binding> </binding>
<binding id="largeheader"> <binding id="largeheader">

60
xpfe/global/resources/content/htmlBindings.xml
Просмотреть файл

@ -7,38 +7,38 @@
<binding id="inputFieldsBase"> <binding id="inputFieldsBase">
<handlers> <handlers>
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false" <handler event="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false" <handler event="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_pageup" keycode="VK_PAGE_UP" alt="false" shift="false" control="false" <handler event="keypress" id="key_pageup" keycode="VK_PAGE_UP" alt="false" shift="false" control="false"
command="cmd_scrollPageUp"/> command="cmd_scrollPageUp"/>
<handler type="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN" alt="false" shift="false" control="false" <handler event="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN" alt="false" shift="false" control="false"
command="cmd_scrollPageDown"/> command="cmd_scrollPageDown"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false" <handler event="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false"
command="cmd_selectCharPrevious"/> command="cmd_selectCharPrevious"/>
<handler type="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false" <handler event="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false"
command="cmd_selectCharNext"/> command="cmd_selectCharNext"/>
<handler type="keypress" id="key_undo" key="z" primary="true" <handler event="keypress" id="key_undo" key="z" primary="true"
command="cmd_undo"/> command="cmd_undo"/>
<!-- Cut/copy/paste/undo --> <!-- Cut/copy/paste/undo -->
<handler type="keypress" id="key_copy" key="c" primary="true" <handler event="keypress" id="key_copy" key="c" primary="true"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_cut" key="x" primary="true" <handler event="keypress" id="key_cut" key="x" primary="true"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_paste" key="v" primary="true" <handler event="keypress" id="key_paste" key="v" primary="true"
command="cmd_paste"/> command="cmd_paste"/>
<handler type="keypress" id="key_undo" key="z" primary="true" <handler event="keypress" id="key_undo" key="z" primary="true"
command="cmd_undo"/> command="cmd_undo"/>
</handlers> </handlers>
@ -47,37 +47,37 @@
<binding id="textAreasBase"> <binding id="textAreasBase">
<handlers> <handlers>
<handler type="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false" <handler event="keypress" id="key_left" keycode="VK_LEFT" alt="false" shift="false" control="false"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false" <handler event="keypress" id="key_right" keycode="VK_RIGHT" alt="false" shift="false" control="false"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false" <handler event="keypress" id="key_leftshift" keycode="VK_LEFT" shift="true" alt="false" control="false"
command="cmd_selectCharPrevious"/> command="cmd_selectCharPrevious"/>
<handler type="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false" <handler event="keypress" id="key_rightshift" keycode="VK_RIGHT" shift="true" alt="false" control="false"
command="cmd_selectCharNext"/> command="cmd_selectCharNext"/>
<handler type="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false" <handler event="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
command="cmd_linePrevious"/> command="cmd_linePrevious"/>
<handler type="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false" <handler event="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
command="cmd_lineNext"/> command="cmd_lineNext"/>
<handler type="keypress" id="key_up_shift" keycode="VK_UP" shift="true" alt="false" control="false" <handler event="keypress" id="key_up_shift" keycode="VK_UP" shift="true" alt="false" control="false"
command="cmd_selectLinePrevious"/> command="cmd_selectLinePrevious"/>
<handler type="keypress" id="key_down_shift" keycode="VK_DOWN" shift="true" alt="false" control="false" <handler event="keypress" id="key_down_shift" keycode="VK_DOWN" shift="true" alt="false" control="false"
command="cmd_selectLineNext"/> command="cmd_selectLineNext"/>
<handler type="keypress" id="key_pageup" keycode="VK_PAGE_UP" alt="false" shift="false" control="false" <handler event="keypress" id="key_pageup" keycode="VK_PAGE_UP" alt="false" shift="false" control="false"
command="cmd_scrollPageUp"/> command="cmd_scrollPageUp"/>
<handler type="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN" alt="false" shift="false" control="false" <handler event="keypress" id="key_pagedown" keycode="VK_PAGE_DOWN" alt="false" shift="false" control="false"
command="cmd_scrollPageDown"/> command="cmd_scrollPageDown"/>
<handler type="keypress" id="key_undo" key="z" primary="true" <handler event="keypress" id="key_undo" key="z" primary="true"
command="cmd_undo"/> command="cmd_undo"/>
<!-- Cut/copy/paste/undo --> <!-- Cut/copy/paste/undo -->
<handler type="keypress" id="key_copy" key="c" primary="true" <handler event="keypress" id="key_copy" key="c" primary="true"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_cut" key="x" primary="true" <handler event="keypress" id="key_cut" key="x" primary="true"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_paste" key="v" primary="true" <handler event="keypress" id="key_paste" key="v" primary="true"
command="cmd_paste"/> command="cmd_paste"/>
<handler type="keypress" id="key_undo" key="z" primary="true" <handler event="keypress" id="key_undo" key="z" primary="true"
command="cmd_undo"/> command="cmd_undo"/>
</handlers> </handlers>

76
xpfe/global/resources/content/mac/platformHTMLBindings.xml
Просмотреть файл

@ -7,52 +7,52 @@
<binding id="inputFields" extends="chrome://global/content/htmlBindings.xml#inputFieldsBase"> <binding id="inputFields" extends="chrome://global/content/htmlBindings.xml#inputFieldsBase">
<handlers> <handlers>
<handler type="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false" <handler event="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false" <handler event="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
command="cmd_linePrevious"/> command="cmd_linePrevious"/>
<handler type="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false" <handler event="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
command="cmd_lineNext"/> command="cmd_lineNext"/>
<handler type="keypress" id="key_up_shift" keycode="VK_UP" alt="false" shift="true" control="false" <handler event="keypress" id="key_up_shift" keycode="VK_UP" alt="false" shift="true" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_down_shift" keycode="VK_DOWN" alt="false" shift="true" control="false" <handler event="keypress" id="key_down_shift" keycode="VK_DOWN" alt="false" shift="true" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false"
command="cmd_scrollPageUp"/> command="cmd_scrollPageUp"/>
<handler type="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false"
command="cmd_scrollPageDown"/> command="cmd_scrollPageDown"/>
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" meta="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" meta="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" meta="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" meta="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" meta="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" meta="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" meta="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" meta="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false" <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false" <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false" <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false" <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false"
command="cmd_linePrevious"/> command="cmd_linePrevious"/>
<handler type="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false"
command="cmd_lineNext"/> command="cmd_lineNext"/>
<handler type="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false" <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false" <handler event="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<!-- Emacsish single-line motion and delete keys --> <!-- Emacsish single-line motion and delete keys -->
<handler type="keypress" id="key_delback" key="h" control="true" <handler event="keypress" id="key_delback" key="h" control="true"
command="cmd_deleteCharBackward"/> command="cmd_deleteCharBackward"/>
<handler type="keypress" id="key_delforw" key="d" control="true" <handler event="keypress" id="key_delforw" key="d" control="true"
command="cmd_deleteCharForward"/> command="cmd_deleteCharForward"/>
</handlers> </handlers>
@ -61,45 +61,45 @@
<binding id="textAreas" extends="chrome://global/content/htmlBindings.xml#textAreasBase"> <binding id="textAreas" extends="chrome://global/content/htmlBindings.xml#textAreasBase">
<handlers> <handlers>
<handler type="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false" <handler event="keypress" id="key_redo" key="z" primary="true" shift="true" alt="false" control="false"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_scrollPageUp"/> command="cmd_scrollPageUp"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_scrollPageDown"/> command="cmd_scrollPageDown"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_up_meta" keycode="VK_UP" meta="true" alt="false" shift="false" control="false"
command="cmd_scrollPageUp"/> command="cmd_scrollPageUp"/>
<handler type="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_down_meta" keycode="VK_DOWN" meta="true" alt="false" shift="false" control="false"
command="cmd_scrollPageDown"/> command="cmd_scrollPageDown"/>
<handler type="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false" <handler event="keypress" id="key_leftalt" keycode="VK_LEFT" alt="true" shift="false" control="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false" <handler event="keypress" id="key_rightalt" keycode="VK_RIGHT" alt="true" shift="false" control="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false" <handler event="keypress" id="key_leftshiftalt" keycode="VK_LEFT" alt="true" shift="true" control="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false" <handler event="keypress" id="key_rightshiftalt" keycode="VK_RIGHT" alt="true" shift="true" control="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_leftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="false" control="false"
command="cmd_linePrevious"/> command="cmd_linePrevious"/>
<handler type="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false" <handler event="keypress" id="key_rightmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="false" control="false"
command="cmd_lineNext"/> command="cmd_lineNext"/>
<handler type="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false" <handler event="keypress" id="key_leftshiftmeta" keycode="VK_LEFT" meta="true" alt="false" shift="true" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false" <handler event="keypress" id="key_rightshiftmeta" keycode="VK_RIGHT" meta="true" alt="false" shift="true" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<!-- Emacsish single-line motion and delete keys --> <!-- Emacsish single-line motion and delete keys -->
<handler type="keypress" id="key_delback" key="h" control="true" <handler event="keypress" id="key_delback" key="h" control="true"
command="cmd_deleteCharBackward"/> command="cmd_deleteCharBackward"/>
<handler type="keypress" id="key_delforw" key="d" control="true" <handler event="keypress" id="key_delforw" key="d" control="true"
command="cmd_deleteCharForward"/> command="cmd_deleteCharForward"/>
</handlers> </handlers>

14
xpfe/global/resources/content/menulistBindings.xml
Просмотреть файл

@ -16,12 +16,12 @@
<xul:image class="menu-dropmarker"/> <xul:image class="menu-dropmarker"/>
</content> </content>
<handlers> <handlers>
<handler type="command" capturer="true" value="if (event.target.localName == 'menuitem') { this.selectedItem = event.target; this.data = this.selectedItem.data; }"/> <handler event="command" phase="capturing" action="if (event.target.localName == 'menuitem') { this.selectedItem = event.target; this.data = this.selectedItem.data; }"/>
</handlers> </handlers>
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
</interface> </implementation>
</binding> </binding>
<!-- <!--
@ -31,11 +31,11 @@
<binding id="menulist-editable"> <binding id="menulist-editable">
<content excludes="template,observes,menupopup"> <content excludes="template,observes,menupopup">
<xul:image class="menu-icon" inherits="src"/> <xul:image class="menu-icon" inherits="src"/>
<html:input type="text" flex="1" class="menu-text" allowevents="true" inherits="value,disabled"/> <html:input event="text" flex="1" class="menu-text" allowevents="true" inherits="value,disabled"/>
<xul:image class="menu-dropmarker"/> <xul:image class="menu-dropmarker"/>
</content> </content>
<handlers> <handlers>
<handler type="command" capturer="true" value="if (event.target.localName == 'menuitem') { this.selectedItem = event.target; this.data = this.selectedItem.data; }"/> <handler event="command" phase="capturing" action="if (event.target.localName == 'menuitem') { this.selectedItem = event.target; this.data = this.selectedItem.data; }"/>
</handlers> </handlers>
</binding> </binding>
@ -137,7 +137,7 @@
<xul:image class="menubutton-dropmarker" inherits="disabled"/> <xul:image class="menubutton-dropmarker" inherits="disabled"/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="buttonover"> <property name="buttonover">
<getter> <getter>
return this.getAttribute("buttonover"); return this.getAttribute("buttonover");
@ -172,7 +172,7 @@
</property> </property>
<property name="_pendingActive">false</property> <property name="_pendingActive">false</property>
<property name="_buttonIsDown">false</property> <property name="_buttonIsDown">false</property>
</interface> </implementation>
</binding> </binding>
<!-- <!--

104
xpfe/global/resources/content/os2/platformHTMLBindings.xml
Просмотреть файл

@ -8,59 +8,59 @@
<handlers> <handlers>
<!-- Emacsish single-line motion and delete keys --> <!-- Emacsish single-line motion and delete keys -->
<handler type="keypress" id="key_home" key="a" control="true" <handler event="keypress" id="key_home" key="a" control="true"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" key="e" control="true" <handler event="keypress" id="key_end" key="e" control="true"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_left" key="b" control="true" <handler event="keypress" id="key_left" key="b" control="true"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_right" key="f" control="true" <handler event="keypress" id="key_right" key="f" control="true"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_delback" key="h" control="true" <handler event="keypress" id="key_delback" key="h" control="true"
command="cmd_deleteCharBackward"/> command="cmd_deleteCharBackward"/>
<handler type="keypress" id="key_delforw" key="d" control="true" <handler event="keypress" id="key_delforw" key="d" control="true"
command="cmd_deleteCharForward"/> command="cmd_deleteCharForward"/>
<handler type="keypress" id="key_delwback" key="w" control="true" <handler event="keypress" id="key_delwback" key="w" control="true"
command="cmd_deleteWordBackward"/> command="cmd_deleteWordBackward"/>
<handler type="keypress" id="key_del_bol" key="u" control="true" <handler event="keypress" id="key_del_bol" key="u" control="true"
command="cmd_deleteToBeginningOfLine"/> command="cmd_deleteToBeginningOfLine"/>
<handler type="keypress" id="key_del_eol" key="k" control="true" <handler event="keypress" id="key_del_eol" key="k" control="true"
command="cmd_deleteToEndOfLine"/> command="cmd_deleteToEndOfLine"/>
<!-- Windows copy/paste/undo/redo keys --> <!-- Windows copy/paste/undo/redo keys -->
<handler type="keypress" id="key_wincopy" key="c" control="true" <handler event="keypress" id="key_wincopy" key="c" control="true"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_wincut" key="x" control="true" <handler event="keypress" id="key_wincut" key="x" control="true"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_winundo" key="z" control="true" <handler event="keypress" id="key_winundo" key="z" control="true"
command="cmd_undo"/> command="cmd_undo"/>
<handler type="keypress" id="key_winredo" key="r" control="true" <handler event="keypress" id="key_winredo" key="r" control="true"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false" <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
command="cmd_paste"/> command="cmd_paste"/>
<!-- navigating by word keys --> <!-- navigating by word keys -->
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_redo" key="y" primary="true" <handler event="keypress" id="key_redo" key="y" primary="true"
command="cmd_redo"/> command="cmd_redo"/>
</handlers> </handlers>
</binding> </binding>
@ -69,65 +69,65 @@
<handlers> <handlers>
<!-- Emacsish single-line motion and delete keys --> <!-- Emacsish single-line motion and delete keys -->
<handler type="keypress" id="key_home" key="a" control="true" <handler event="keypress" id="key_home" key="a" control="true"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" key="e" control="true" <handler event="keypress" id="key_end" key="e" control="true"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_left" key="b" control="true" <handler event="keypress" id="key_left" key="b" control="true"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_right" key="f" control="true" <handler event="keypress" id="key_right" key="f" control="true"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_delback" key="h" control="true" <handler event="keypress" id="key_delback" key="h" control="true"
command="cmd_deleteCharBackward"/> command="cmd_deleteCharBackward"/>
<handler type="keypress" id="key_delforw" key="d" control="true" <handler event="keypress" id="key_delforw" key="d" control="true"
command="cmd_deleteCharForward"/> command="cmd_deleteCharForward"/>
<handler type="keypress" id="key_delwback" key="w" control="true" <handler event="keypress" id="key_delwback" key="w" control="true"
command="cmd_deleteWordBackward"/> command="cmd_deleteWordBackward"/>
<handler type="keypress" id="key_del_bol" key="u" control="true" <handler event="keypress" id="key_del_bol" key="u" control="true"
command="cmd_deleteToBeginningOfLine"/> command="cmd_deleteToBeginningOfLine"/>
<handler type="keypress" id="key_del_eol" key="k" control="true" <handler event="keypress" id="key_del_eol" key="k" control="true"
command="cmd_deleteToEndOfLine"/> command="cmd_deleteToEndOfLine"/>
<!-- Windows copy/paste/undo/redo keys --> <!-- Windows copy/paste/undo/redo keys -->
<handler type="keypress" id="key_wincopy" key="c" control="true" <handler event="keypress" id="key_wincopy" key="c" control="true"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_wincut" key="x" control="true" <handler event="keypress" id="key_wincut" key="x" control="true"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_winundo" key="z" control="true" <handler event="keypress" id="key_winundo" key="z" control="true"
command="cmd_undo"/> command="cmd_undo"/>
<handler type="keypress" id="key_winredo" key="r" control="true" <handler event="keypress" id="key_winredo" key="r" control="true"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false" <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
command="cmd_paste"/> command="cmd_paste"/>
<!-- Emacsish multi-line motion and delete keys --> <!-- Emacsish multi-line motion and delete keys -->
<handler type="keypress" id="key_linedown" key="n" control="true" <handler event="keypress" id="key_linedown" key="n" control="true"
command="cmd_lineNext"/> command="cmd_lineNext"/>
<handler type="keypress" id="key_lineup" key="p" control="true" <handler event="keypress" id="key_lineup" key="p" control="true"
command="cmd_linePrevious"/> command="cmd_linePrevious"/>
<!-- handle home/end/arrow keys and redo --> <!-- handle home/end/arrow keys and redo -->
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_redo" key="y" primary="true" <handler event="keypress" id="key_redo" key="y" primary="true"
command="cmd_redo"/> command="cmd_redo"/>
</handlers> </handlers>
</binding> </binding>

12
xpfe/global/resources/content/radioBindings.xml
Просмотреть файл

@ -6,17 +6,17 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="radio" extends="chrome://global/content/xulBindings.xml#checkbox"> <binding id="radio" extends="chrome://global/content/xulBindings.xml#checkbox">
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
<property name="group" onset="this.setAttribute('group',val); return val;" <property name="group" onset="this.setAttribute('group',val); return val;"
onget="return this.getAttribute('group');"/> onget="return this.getAttribute('group');"/>
</interface> </implementation>
</binding> </binding>
<binding id="radiogroup" extends="xul:box"> <binding id="radiogroup" extends="xul:box">
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
<property name="selectedItem"> <property name="selectedItem">
@ -52,9 +52,9 @@
]]> ]]>
</setter> </setter>
</property> </property>
</interface> </implementation>
<handlers> <handlers>
<handler type="click"> <handler event="click">
<![CDATA[ <![CDATA[
try try
{ {
@ -68,7 +68,7 @@
} }
]]> ]]>
</handler> </handler>
<handler type="keypress" key=" "> <handler event="keypress" key=" ">
<![CDATA[ <![CDATA[
try try
{ {

22
xpfe/global/resources/content/tabBindings.xml
Просмотреть файл

@ -6,8 +6,8 @@
<binding id="tabcontrol" extends="xul:box"> <binding id="tabcontrol" extends="xul:box">
<content orient="vertical" excludes="*"/> <content orient="vertical" excludes="*"/>
<!-- pass-through interface --> <!-- pass-through implementation -->
<interface> <implementation>
<property name="selectedTab"> <property name="selectedTab">
<setter> <setter>
<![CDATA[ <![CDATA[
@ -25,11 +25,11 @@
]]> ]]>
</getter> </getter>
</property> </property>
</interface> </implementation>
</binding> </binding>
<binding id="tabbox" extends="xul:box"> <binding id="tabbox" extends="xul:box">
<interface> <implementation>
<property name="selectedTab"> <property name="selectedTab">
<getter> <getter>
<![CDATA[ <![CDATA[
@ -65,9 +65,9 @@
]]> ]]>
</setter> </setter>
</property> </property>
</interface> </implementation>
<handlers> <handlers>
<handler name="bindingattached"> <handler event="bindingattached">
<![CDATA[ <![CDATA[
// first and last tabs need to be able to have unique styles // first and last tabs need to be able to have unique styles
// and also need to select first tab on startup. // and also need to select first tab on startup.
@ -87,12 +87,12 @@
</binding> </binding>
<binding id="tabpanel" extends="xul:deck"> <binding id="tabpanel" extends="xul:deck">
<interface> <implementation>
<!-- should be defined on deck! --> <!-- should be defined on deck! -->
<property name="index" <property name="index"
onget="return this.getAttribute('index');" onget="return this.getAttribute('index');"
onset="this.setAttribute('index',val); return val;"/> onset="this.setAttribute('index',val); return val;"/>
</interface> </implementation>
</binding> </binding>
<binding id="tab" extends="xul:button"> <binding id="tab" extends="xul:button">
@ -102,7 +102,7 @@
<xul:text class="tab-text" inherits="value,accesskey,crop"/> <xul:text class="tab-text" inherits="value,accesskey,crop"/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="value"> <property name="value">
<getter> <getter>
return this.getAttribute("value"); return this.getAttribute("value");
@ -129,9 +129,9 @@
return val; return val;
</setter> </setter>
</property> </property>
</interface> </implementation>
<handlers> <handlers>
<handler type="click"> <handler event="click">
<![CDATA[ <![CDATA[
var tabbox = this.parentNode; var tabbox = this.parentNode;
while (tabbox.localName != "tabcontrol") { while (tabbox.localName != "tabcontrol") {

18
xpfe/global/resources/content/toolbarBindings.xml
Просмотреть файл

@ -33,7 +33,7 @@ Contributor(s):
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="toolbargrippy" extends="xul:button"> <binding id="toolbargrippy" extends="xul:button">
<interface> <implementation>
<property name="collapsed"> <property name="collapsed">
<getter> <getter>
return this.getAttribute("moz_grippy_collapsed"); return this.getAttribute("moz_grippy_collapsed");
@ -69,7 +69,7 @@ Contributor(s):
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding> </binding>
<binding id="toolbox" extends="xul:box"> <binding id="toolbox" extends="xul:box">
@ -82,7 +82,7 @@ Contributor(s):
<xul:spring flex="1" class="collapsed-tray-spring"/> <xul:spring flex="1" class="collapsed-tray-spring"/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<method name="collapseToolbar"> <method name="collapseToolbar">
<argument name="toolbar"/> <argument name="toolbar"/>
<body> <body>
@ -186,9 +186,9 @@ Contributor(s):
return val; return val;
</setter> </setter>
</property> </property>
</interface> </implementation>
<handlers> <handlers>
<handler type="bindingattached"> <handler event="bindingattached">
this.init(event); this.init(event);
</handler> </handler>
</handlers> </handlers>
@ -203,7 +203,7 @@ Contributor(s):
<children/> <children/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<method name="findNodeByAttribute"> <method name="findNodeByAttribute">
<argument name="aAttribute"/> <argument name="aAttribute"/>
<argument name="aValue"/> <argument name="aValue"/>
@ -221,7 +221,7 @@ Contributor(s):
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding> </binding>
<binding id="menubar" extends="xul:menubar"> <binding id="menubar" extends="xul:menubar">
@ -233,7 +233,7 @@ Contributor(s):
<children/> <children/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<method name="findNodeByAttribute"> <method name="findNodeByAttribute">
<argument name="aAttribute"/> <argument name="aAttribute"/>
<argument name="aValue"/> <argument name="aValue"/>
@ -251,7 +251,7 @@ Contributor(s):
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding> </binding>
</bindings> </bindings>

42
xpfe/global/resources/content/treeBindings.xml
Просмотреть файл

@ -6,7 +6,7 @@
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="treeitem"> <binding id="treeitem">
<interface> <implementation>
<method name="toggleOpenState"> <method name="toggleOpenState">
<body> <body>
<![CDATA[ <![CDATA[
@ -41,7 +41,7 @@
]]> ]]>
</body> </body>
</method> </method>
</interface> </implementation>
</binding> </binding>
<binding id="treecell-indented-folder"> <binding id="treecell-indented-folder">
@ -106,7 +106,7 @@
<children includes="treehead,treechildren"/> <children includes="treehead,treechildren"/>
</xul:treerows> </xul:treerows>
</content> </content>
<interface> <implementation>
<property name="selectedIndex" <property name="selectedIndex"
onget="return (this.selectedItems.length > 0 ? this.getIndexOfItem(this.selectedItems[0]) : -1)" onget="return (this.selectedItems.length > 0 ? this.getIndexOfItem(this.selectedItems[0]) : -1)"
onset="if(val>=0){var item=this.getItemAtIndex(val); if(item) this.selectItem(item);} else this.clearItemSelection();" onset="if(val>=0){var item=this.getItemAtIndex(val); if(item) this.selectItem(item);} else this.clearItemSelection();"
@ -173,23 +173,23 @@
return this.treeBoxObject.getRowCount(); return this.treeBoxObject.getRowCount();
</body> </body>
</method> </method>
</interface> </implementation>
<handlers> <handlers>
<handler type="keypress" keycode="vk_enter"> <handler event="keypress" keycode="vk_enter">
<![CDATA[ <![CDATA[
if (event.target != this || selectedItems.length != 1) if (event.target != this || selectedItems.length != 1)
return; return;
this.selectedItems[0].toggleOpenState(); this.selectedItems[0].toggleOpenState();
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_return"> <handler event="keypress" keycode="vk_return">
<![CDATA[ <![CDATA[
if (event.target != this || selectedItems.length != 1) if (event.target != this || selectedItems.length != 1)
return; return;
this.selectedItems[0].toggleOpenState(); this.selectedItems[0].toggleOpenState();
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_left"> <handler event="keypress" keycode="vk_left">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -203,14 +203,14 @@
} }
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_right"> <handler event="keypress" keycode="vk_right">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
this.selectedItems[0].open(); this.selectedItems[0].open();
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_up"> <handler event="keypress" keycode="vk_up">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -221,7 +221,7 @@
} }
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_down"> <handler event="keypress" keycode="vk_down">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -232,7 +232,7 @@
} }
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_page_up"> <handler event="keypress" keycode="vk_page_up">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -257,7 +257,7 @@
} }
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_page_down"> <handler event="keypress" keycode="vk_page_down">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -283,7 +283,7 @@
} }
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_home"> <handler event="keypress" keycode="vk_home">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -291,7 +291,7 @@
this.selectItem(this.getItemAtIndex(0)); this.selectItem(this.getItemAtIndex(0));
]]> ]]>
</handler> </handler>
<handler type="keypress" keycode="vk_end"> <handler event="keypress" keycode="vk_end">
<![CDATA[ <![CDATA[
if (event.target != this || this.selectedItems.length != 1) if (event.target != this || this.selectedItems.length != 1)
return; return;
@ -308,7 +308,7 @@
<handlers> <handlers>
<!-- If there is no modifier key, we select on mousedown, not <!-- If there is no modifier key, we select on mousedown, not
click, so that drags work correctly. --> click, so that drags work correctly. -->
<handler type="mousedown" shift="false" control="false" <handler event="mousedown" shift="false" control="false"
meta="false" alt="false"> meta="false" alt="false">
<![CDATA[ <![CDATA[
if (event.target.localName == 'treecell') { if (event.target.localName == 'treecell') {
@ -323,7 +323,7 @@
<!-- On a click (up+down on the same item), deselect everything <!-- On a click (up+down on the same item), deselect everything
except this item. --> except this item. -->
<handler type="click" shift="false" control="false" meta="false" <handler event="click" shift="false" control="false" meta="false"
alt="false"> alt="false">
<![CDATA[ <![CDATA[
if (event.target.localName == 'treecell') { if (event.target.localName == 'treecell') {
@ -340,7 +340,7 @@
</handler> </handler>
<!-- For discontinuous selection of items --> <!-- For discontinuous selection of items -->
<handler type="click" shift="false" control="true" alt="false"> <handler event="click" shift="false" control="true" alt="false">
<![CDATA[ <![CDATA[
if (event.target.localName == 'treecell') { if (event.target.localName == 'treecell') {
parentNode.toggleItemSelection(event.target.parentNode.parentNode); parentNode.toggleItemSelection(event.target.parentNode.parentNode);
@ -350,7 +350,7 @@
</handler> </handler>
<!-- Same as above, but this one is for the Mac Command key --> <!-- Same as above, but this one is for the Mac Command key -->
<handler type="click" shift="false" meta="true"> <handler event="click" shift="false" meta="true">
<![CDATA[ <![CDATA[
if (event.target.localName == 'treecell') { if (event.target.localName == 'treecell') {
parentNode.toggleItemSelection(event.target.parentNode.parentNode); parentNode.toggleItemSelection(event.target.parentNode.parentNode);
@ -360,7 +360,7 @@
</handler> </handler>
<!-- For continuous selection of items --> <!-- For continuous selection of items -->
<handler type="click" shift="true" control="false" meta="false"> <handler event="click" shift="true" control="false" meta="false">
<![CDATA[ <![CDATA[
if (event.target.localName == 'treecell') { if (event.target.localName == 'treecell') {
parentNode.selectItemRange(null, event.target.parentNode.parentNode); parentNode.selectItemRange(null, event.target.parentNode.parentNode);
@ -370,7 +370,7 @@
</handler> </handler>
<!-- double-click --> <!-- double-click -->
<handler type="click" shift="false" control="false" meta="false" clickcount="2"> <handler event="click" shift="false" control="false" meta="false" clickcount="2">
<![CDATA[ <![CDATA[
if (event.target.localName == 'treecell') { if (event.target.localName == 'treecell') {
var n = event.target.parentNode.parentNode; var n = event.target.parentNode.parentNode;
@ -380,7 +380,7 @@
</handler> </handler>
<!-- normal, single click --> <!-- normal, single click -->
<handler type="click" shift="false" control="false" meta="false"> <handler event="click" shift="false" control="false" meta="false">
<![CDATA[ <![CDATA[
if (event.target.getAttribute('twisty') == 'true') { if (event.target.getAttribute('twisty') == 'true') {
var n = event.target.parentNode.parentNode.parentNode; var n = event.target.parentNode.parentNode.parentNode;

104
xpfe/global/resources/content/unix/platformHTMLBindings.xml
Просмотреть файл

@ -8,59 +8,59 @@
<handlers> <handlers>
<!-- Emacsish single-line motion and delete keys --> <!-- Emacsish single-line motion and delete keys -->
<handler type="keypress" id="key_home" key="a" control="true" <handler event="keypress" id="key_home" key="a" control="true"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" key="e" control="true" <handler event="keypress" id="key_end" key="e" control="true"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_left" key="b" control="true" <handler event="keypress" id="key_left" key="b" control="true"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_right" key="f" control="true" <handler event="keypress" id="key_right" key="f" control="true"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_delback" key="h" control="true" <handler event="keypress" id="key_delback" key="h" control="true"
command="cmd_deleteCharBackward"/> command="cmd_deleteCharBackward"/>
<handler type="keypress" id="key_delforw" key="d" control="true" <handler event="keypress" id="key_delforw" key="d" control="true"
command="cmd_deleteCharForward"/> command="cmd_deleteCharForward"/>
<handler type="keypress" id="key_delwback" key="w" control="true" <handler event="keypress" id="key_delwback" key="w" control="true"
command="cmd_deleteWordBackward"/> command="cmd_deleteWordBackward"/>
<handler type="keypress" id="key_del_bol" key="u" control="true" <handler event="keypress" id="key_del_bol" key="u" control="true"
command="cmd_deleteToBeginningOfLine"/> command="cmd_deleteToBeginningOfLine"/>
<handler type="keypress" id="key_del_eol" key="k" control="true" <handler event="keypress" id="key_del_eol" key="k" control="true"
command="cmd_deleteToEndOfLine"/> command="cmd_deleteToEndOfLine"/>
<!-- Windows copy/paste/undo/redo keys --> <!-- Windows copy/paste/undo/redo keys -->
<handler type="keypress" id="key_wincopy" key="c" control="true" <handler event="keypress" id="key_wincopy" key="c" control="true"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_wincut" key="x" control="true" <handler event="keypress" id="key_wincut" key="x" control="true"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_winundo" key="z" control="true" <handler event="keypress" id="key_winundo" key="z" control="true"
command="cmd_undo"/> command="cmd_undo"/>
<handler type="keypress" id="key_winredo" key="r" control="true" <handler event="keypress" id="key_winredo" key="r" control="true"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false" <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
command="cmd_paste"/> command="cmd_paste"/>
<!-- navigating by word keys --> <!-- navigating by word keys -->
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_redo" key="y" primary="true" <handler event="keypress" id="key_redo" key="y" primary="true"
command="cmd_redo"/> command="cmd_redo"/>
</handlers> </handlers>
</binding> </binding>
@ -69,65 +69,65 @@
<handlers> <handlers>
<!-- Emacsish single-line motion and delete keys --> <!-- Emacsish single-line motion and delete keys -->
<handler type="keypress" id="key_home" key="a" control="true" <handler event="keypress" id="key_home" key="a" control="true"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" key="e" control="true" <handler event="keypress" id="key_end" key="e" control="true"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_left" key="b" control="true" <handler event="keypress" id="key_left" key="b" control="true"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_right" key="f" control="true" <handler event="keypress" id="key_right" key="f" control="true"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_delback" key="h" control="true" <handler event="keypress" id="key_delback" key="h" control="true"
command="cmd_deleteCharBackward"/> command="cmd_deleteCharBackward"/>
<handler type="keypress" id="key_delforw" key="d" control="true" <handler event="keypress" id="key_delforw" key="d" control="true"
command="cmd_deleteCharForward"/> command="cmd_deleteCharForward"/>
<handler type="keypress" id="key_delwback" key="w" control="true" <handler event="keypress" id="key_delwback" key="w" control="true"
command="cmd_deleteWordBackward"/> command="cmd_deleteWordBackward"/>
<handler type="keypress" id="key_del_bol" key="u" control="true" <handler event="keypress" id="key_del_bol" key="u" control="true"
command="cmd_deleteToBeginningOfLine"/> command="cmd_deleteToBeginningOfLine"/>
<handler type="keypress" id="key_del_eol" key="k" control="true" <handler event="keypress" id="key_del_eol" key="k" control="true"
command="cmd_deleteToEndOfLine"/> command="cmd_deleteToEndOfLine"/>
<!-- Windows copy/paste/undo/redo keys --> <!-- Windows copy/paste/undo/redo keys -->
<handler type="keypress" id="key_wincopy" key="c" control="true" <handler event="keypress" id="key_wincopy" key="c" control="true"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_wincut" key="x" control="true" <handler event="keypress" id="key_wincut" key="x" control="true"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_winundo" key="z" control="true" <handler event="keypress" id="key_winundo" key="z" control="true"
command="cmd_undo"/> command="cmd_undo"/>
<handler type="keypress" id="key_winredo" key="r" control="true" <handler event="keypress" id="key_winredo" key="r" control="true"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false" <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
command="cmd_paste"/> command="cmd_paste"/>
<!-- Emacsish multi-line motion and delete keys --> <!-- Emacsish multi-line motion and delete keys -->
<handler type="keypress" id="key_linedown" key="n" control="true" <handler event="keypress" id="key_linedown" key="n" control="true"
command="cmd_lineNext"/> command="cmd_lineNext"/>
<handler type="keypress" id="key_lineup" key="p" control="true" <handler event="keypress" id="key_lineup" key="p" control="true"
command="cmd_linePrevious"/> command="cmd_linePrevious"/>
<!-- handle home/end/arrow keys and redo --> <!-- handle home/end/arrow keys and redo -->
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_redo" key="y" primary="true" <handler event="keypress" id="key_redo" key="y" primary="true"
command="cmd_redo"/> command="cmd_redo"/>
</handlers> </handlers>
</binding> </binding>

56
xpfe/global/resources/content/win/platformHTMLBindings.xml
Просмотреть файл

@ -6,69 +6,69 @@
<binding id="inputFields" extends="chrome://global/content/htmlBindings.xml#inputFieldsBase"> <binding id="inputFields" extends="chrome://global/content/htmlBindings.xml#inputFieldsBase">
<handlers> <handlers>
<handler type="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false" <handler event="keypress" id="key_up" keycode="VK_UP" alt="false" shift="false" control="false"
command="cmd_charPrevious"/> command="cmd_charPrevious"/>
<handler type="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false" <handler event="keypress" id="key_down" keycode="VK_DOWN" alt="false" shift="false" control="false"
command="cmd_charNext"/> command="cmd_charNext"/>
<handler type="keypress" id="key_leftshift" keycode="VK_UP" shift="true" alt="false" control="false" <handler event="keypress" id="key_leftshift" keycode="VK_UP" shift="true" alt="false" control="false"
command="cmd_selectCharPrevious"/> command="cmd_selectCharPrevious"/>
<handler type="keypress" id="key_rightshift" keycode="VK_DOWN" shift="true" alt="false" control="false" <handler event="keypress" id="key_rightshift" keycode="VK_DOWN" shift="true" alt="false" control="false"
command="cmd_selectCharNext"/> command="cmd_selectCharNext"/>
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_redo" key="y" primary="true" <handler event="keypress" id="key_redo" key="y" primary="true"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false" <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
command="cmd_paste"/> command="cmd_paste"/>
</handlers> </handlers>
</binding> </binding>
<binding id="textAreas" extends="chrome://global/content/htmlBindings.xml#textAreasBase"> <binding id="textAreas" extends="chrome://global/content/htmlBindings.xml#textAreasBase">
<handlers> <handlers>
<handler type="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false" <handler event="keypress" id="key_home" keycode="VK_HOME" alt="false" shift="false" control="false"
command="cmd_beginLine"/> command="cmd_beginLine"/>
<handler type="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false" <handler event="keypress" id="key_end" keycode="VK_END" alt="false" shift="false" control="false"
command="cmd_endLine"/> command="cmd_endLine"/>
<handler type="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false" <handler event="keypress" id="key_homeshift" keycode="VK_HOME" shift="true" alt="false" control="false"
command="cmd_selectBeginLine"/> command="cmd_selectBeginLine"/>
<handler type="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false" <handler event="keypress" id="key_endshift" keycode="VK_END" shift="true" alt="false" control="false"
command="cmd_selectEndLine"/> command="cmd_selectEndLine"/>
<handler type="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false" <handler event="keypress" id="key_leftcontrol" keycode="VK_LEFT" control="true" alt="false" shift="false"
command="cmd_wordPrevious"/> command="cmd_wordPrevious"/>
<handler type="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false" <handler event="keypress" id="key_rightcontrol" keycode="VK_RIGHT" control="true" alt="false" shift="false"
command="cmd_wordNext"/> command="cmd_wordNext"/>
<handler type="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false" <handler event="keypress" id="key_leftshiftcontrol" keycode="VK_LEFT" shift="true" control="true" alt="false"
command="cmd_selectWordPrevious"/> command="cmd_selectWordPrevious"/>
<handler type="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false" <handler event="keypress" id="key_rightshiftcontrol" keycode="VK_RIGHT" shift="true" control="true" alt="false"
command="cmd_selectWordNext"/> command="cmd_selectWordNext"/>
<handler type="keypress" id="key_redo" key="y" primary="true" <handler event="keypress" id="key_redo" key="y" primary="true"
command="cmd_redo"/> command="cmd_redo"/>
<handler type="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwincut" keycode="VK_DELETE" shift="true" control="false" alt="false"
command="cmd_cut"/> command="cmd_cut"/>
<handler type="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false" <handler event="keypress" id="key_altwincopy" keycode="VK_INSERT" control="true" shift="false" alt="false"
command="cmd_copy"/> command="cmd_copy"/>
<handler type="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false" <handler event="keypress" id="key_altwinpaste" keycode="VK_INSERT" shift="true" control="false" alt="false"
command="cmd_paste"/> command="cmd_paste"/>
</handlers> </handlers>
</binding> </binding>

77
xpfe/global/resources/content/xulBindings.xml
Просмотреть файл

@ -62,10 +62,10 @@
<xul:image/> <xul:image/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
</interface> </implementation>
</binding> </binding>
<binding id="menuitem"> <binding id="menuitem">
@ -73,10 +73,10 @@
<xul:text class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/> <xul:text class="menu-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
<xul:text class="menu-accel" inherits="acceltext:value"/> <xul:text class="menu-accel" inherits="acceltext:value"/>
</content> </content>
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
</interface> </implementation>
</binding> </binding>
<binding id="menuitem-iconic"> <binding id="menuitem-iconic">
@ -87,10 +87,10 @@
<xul:text class="menu-iconic-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/> <xul:text class="menu-iconic-text" flex="1" align="left" inherits="value,accesskey,crop" crop="right"/>
<xul:text class="menu-iconic-accel" inherits="acceltext:value"/> <xul:text class="menu-iconic-accel" inherits="acceltext:value"/>
</content> </content>
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
</interface> </implementation>
</binding> </binding>
<binding id="menu-iconic"> <binding id="menu-iconic">
@ -104,15 +104,15 @@
<xul:image/> <xul:image/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="data" onset="this.setAttribute('data',val); return val;" <property name="data" onset="this.setAttribute('data',val); return val;"
onget="return this.getAttribute('data');"/> onget="return this.getAttribute('data');"/>
</interface> </implementation>
</binding> </binding>
<binding id="basetext"> <binding id="basetext">
<interface> <implementation>
<!-- public interface --> <!-- public implementation -->
<property name="value" onset="return this.setAttribute('value',val);" <property name="value" onset="return this.setAttribute('value',val);"
onget="return this.getAttribute('value');"/> onget="return this.getAttribute('value');"/>
<property name="crop" onset="return this.setAttribute('crop',val);" <property name="crop" onset="return this.setAttribute('crop',val);"
@ -128,7 +128,7 @@
onget="return this.getAttribute('accesskey');"/> onget="return this.getAttribute('accesskey');"/>
<property name="imgalign" onset="return this.setAttribute('imgalign',val);" <property name="imgalign" onset="return this.setAttribute('imgalign',val);"
onget="return this.getAttribute('imgalign');"/> onget="return this.getAttribute('imgalign');"/>
</interface> </implementation>
</binding> </binding>
<binding id="checkbox" extends="chrome://global/content/xulBindings.xml#basetext"> <binding id="checkbox" extends="chrome://global/content/xulBindings.xml#basetext">
@ -143,21 +143,21 @@
</xul:html> </xul:html>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<!-- public interface --> <!-- public implementation -->
<property name="checked" onset="if (val) this.setAttribute('checked', 'true'); <property name="checked" onset="if (val) this.setAttribute('checked', 'true');
else this.removeAttribute('checked'); else this.removeAttribute('checked');
return val;" return val;"
onget="var v = this.getAttribute('checked'); onget="var v = this.getAttribute('checked');
if (v == 'true') return true; return false;"/> if (v == 'true') return true; return false;"/>
</interface> </implementation>
<handlers> <handlers>
<handler type="click"> <handler event="click">
<![CDATA[ <![CDATA[
if (!this.disabled) this.checked = !this.checked; if (!this.disabled) this.checked = !this.checked;
]]> ]]>
</handler> </handler>
<handler type="keypress" key=" " value="if (!this.disabled) this.checked = !this.checked;"/> <handler event="keypress" key=" " action="if (!this.disabled) this.checked = !this.checked;"/>
</handlers> </handlers>
</binding> </binding>
@ -225,14 +225,14 @@
</xul:stack> </xul:stack>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="progresstext" onset="this.setAttribute('progresstext',val); return val;" <property name="progresstext" onset="this.setAttribute('progresstext',val); return val;"
onget="return this.getAttribute('progresstext');"/> onget="return this.getAttribute('progresstext');"/>
<property name="value" onset="this.setAttribute('value',val); return val;" <property name="value" onset="this.setAttribute('value',val); return val;"
onget="return this.getAttribute('value');"/> onget="return this.getAttribute('value');"/>
<property name="mode" onset="this.setAttribute('mode', val); return val;" <property name="mode" onset="this.setAttribute('mode', val); return val;"
onget="return this.getAttribute('mode');"/> onget="return this.getAttribute('mode');"/>
</interface> </implementation>
</binding> </binding>
<binding id="textfield" extends="xul:box"> <binding id="textfield" extends="xul:box">
@ -241,7 +241,7 @@
<html:input class="textfield-input" flex="1" inherits="value,type,maxlength,disabled,size,readonly"/> <html:input class="textfield-input" flex="1" inherits="value,type,maxlength,disabled,size,readonly"/>
</xul:box> </xul:box>
</content> </content>
<interface> <implementation>
<property name="value" onset="document.getAnonymousNodes(this)[0].firstChild.value = val; return val;" <property name="value" onset="document.getAnonymousNodes(this)[0].firstChild.value = val; return val;"
onget="return document.getAnonymousNodes(this)[0].firstChild.value;"/> onget="return document.getAnonymousNodes(this)[0].firstChild.value;"/>
<property name="type" onset="document.getAnonymousNodes(this)[0].firstChild.type = val; return val;" <property name="type" onset="document.getAnonymousNodes(this)[0].firstChild.type = val; return val;"
@ -287,10 +287,10 @@
document.getAnonymousNodes(this)[0].firstChild.setSelectionRange( aSelectionStart, aSelectionEnd ); document.getAnonymousNodes(this)[0].firstChild.setSelectionRange( aSelectionStart, aSelectionEnd );
</body> </body>
</method> </method>
</interface> </implementation>
<handlers> <handlers>
<handler type="focus" capturer="true" value="this.setAttribute('focused','true');"/> <handler event="focus" phase="capturing" action="this.setAttribute('focused','true');"/>
<handler type="blur" capturer="true" value="this.removeAttribute('focused');"/> <handler event="blur" phase="capturing" action="this.removeAttribute('focused');"/>
</handlers> </handlers>
</binding> </binding>
@ -304,7 +304,7 @@
<binding id="text"> <binding id="text">
<handlers> <handlers>
<handler type="click" value="var forElementID = this.getAttribute('for'); if(forElementID) var forElement = document.getElementById(forElementID); if(forElement) forElement.focus();"/> <handler event="click" action="var forElementID = this.getAttribute('for'); if(forElementID) var forElement = document.getElementById(forElementID); if(forElement) forElement.focus();"/>
</handlers> </handlers>
</binding> </binding>
@ -317,7 +317,7 @@
</xul:box> </xul:box>
</content> </content>
<handlers> <handlers>
<handler type="blur" value="this.setAttribute('mode','display');"/> <handler event="blur" action="this.setAttribute('mode','display');"/>
</handlers> </handlers>
</binding> </binding>
@ -342,7 +342,7 @@
</xul:arrowscrollbox> </xul:arrowscrollbox>
</content> </content>
<interface> <implementation>
<method name="openPopup"> <method name="openPopup">
<argument name="element"/> <argument name="element"/>
<argument name="xpos"/> <argument name="xpos"/>
@ -403,20 +403,15 @@
]]> ]]>
</setter> </setter>
</property> </property>
</interface> </implementation>
</binding> </binding>
<binding id="colorpicker" extends="xul:box"> <binding id="colorpicker" extends="xul:box">
<interface> <implementation>
<property name="color" onset="return this.setAttribute('color', val);" <property name="color" onset="return this.setAttribute('color', val);"
onget="return this.getAttribute('color');"/> onget="return this.getAttribute('color');"/>
<property name="selectedItem"/> <property name="selectedItem"/>
</interface> </implementation>
<handlers>
<handler type="click" value="dump('handler fired\n');"/>
</handlers>
<content> <content>
<xul:box flex="1" orient="vertical" onclick="parentNode.color = event.target.getAttribute('color'); <xul:box flex="1" orient="vertical" onclick="parentNode.color = event.target.getAttribute('color');
@ -521,38 +516,38 @@
<xul:image class="statusbar-panel-icon" inherits="src"/> <xul:image class="statusbar-panel-icon" inherits="src"/>
<xul:text class="statusbar-panel-text" inherits="value,crop" crop="right" flex="1"/> <xul:text class="statusbar-panel-text" inherits="value,crop" crop="right" flex="1"/>
</content> </content>
<interface> <implementation>
<property name="value" <property name="value"
onget="return this.getAttribute('value');" onget="return this.getAttribute('value');"
onset="this.setAttribute('value',val); return val;"/> onset="this.setAttribute('value',val); return val;"/>
<property name="src" <property name="src"
onget="return this.getAttribute('src');" onget="return this.getAttribute('src');"
onset="this.setAttribute('src',val); return val;"/> onset="this.setAttribute('src',val); return val;"/>
</interface> </implementation>
</binding> </binding>
<binding id="browser"> <binding id="browser">
<interface> <implementation>
<property name="webBrowser" <property name="webBrowser"
readonly="true" readonly="true"
onget="return this.boxObject.QueryInterface(Components.interfaces.nsIBrowserBoxObject).webBrowser"/> onget="return this.boxObject.QueryInterface(Components.interfaces.nsIBrowserBoxObject).webBrowser"/>
</interface> </implementation>
</binding> </binding>
<binding id="editor"> <binding id="editor">
<interface> <implementation>
<property name="editorShell" <property name="editorShell"
readonly="true" readonly="true"
onget="return this.boxObject.QueryInterface(Components.interfaces.nsIEditorBoxObject).editorShell"/> onget="return this.boxObject.QueryInterface(Components.interfaces.nsIEditorBoxObject).editorShell"/>
</interface> </implementation>
</binding> </binding>
<binding id="iframe"> <binding id="iframe">
<interface> <implementation>
<property name="docShell" <property name="docShell"
readonly="true" readonly="true"
onget="return this.boxObject.QueryInterface(Components.interfaces.nsIIFrameBoxObject).docShell"/> onget="return this.boxObject.QueryInterface(Components.interfaces.nsIIFrameBoxObject).docShell"/>
</interface> </implementation>
</binding> </binding>
<binding id="titledbox"> <binding id="titledbox">