Backing out the fix for bug 148782 since it caused bug 204029.

This commit is contained in:
jst%netscape.com 2003-05-06 02:01:52 +00:00
Родитель 74a6ecd06e
Коммит b4f676181d
2 изменённых файлов: 1 добавлений и 10 удалений

Просмотреть файл

@ -890,7 +890,6 @@ jsval nsDOMClassInfo::sDocument_id = JSVAL_VOID;
jsval nsDOMClassInfo::sWindow_id = JSVAL_VOID; jsval nsDOMClassInfo::sWindow_id = JSVAL_VOID;
jsval nsDOMClassInfo::sFrames_id = JSVAL_VOID; jsval nsDOMClassInfo::sFrames_id = JSVAL_VOID;
jsval nsDOMClassInfo::sSelf_id = JSVAL_VOID; jsval nsDOMClassInfo::sSelf_id = JSVAL_VOID;
jsval nsDOMClassInfo::sSubmit_id = JSVAL_VOID;
const JSClass *nsDOMClassInfo::sObjectClass = nsnull; const JSClass *nsDOMClassInfo::sObjectClass = nsnull;
@ -993,7 +992,6 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
SET_JSVAL_TO_STRING(sWindow_id, cx, "window"); SET_JSVAL_TO_STRING(sWindow_id, cx, "window");
SET_JSVAL_TO_STRING(sFrames_id, cx, "frames"); SET_JSVAL_TO_STRING(sFrames_id, cx, "frames");
SET_JSVAL_TO_STRING(sSelf_id, cx, "self"); SET_JSVAL_TO_STRING(sSelf_id, cx, "self");
SET_JSVAL_TO_STRING(sSubmit_id, cx, "submit");
return NS_OK; return NS_OK;
} }
@ -2831,7 +2829,6 @@ nsDOMClassInfo::ShutDown()
sWindow_id = JSVAL_VOID; sWindow_id = JSVAL_VOID;
sFrames_id = JSVAL_VOID; sFrames_id = JSVAL_VOID;
sSelf_id = JSVAL_VOID; sSelf_id = JSVAL_VOID;
sSubmit_id = JSVAL_VOID;
NS_IF_RELEASE(sXPConnect); NS_IF_RELEASE(sXPConnect);
NS_IF_RELEASE(sSecMan); NS_IF_RELEASE(sSecMan);
@ -5282,11 +5279,7 @@ nsHTMLFormElementSH::NewResolve(nsIXPConnectWrappedNative *wrapper,
PRUint32 flags, JSObject **objp, PRUint32 flags, JSObject **objp,
PRBool *_retval) PRBool *_retval)
{ {
// If we're resolving a string other than "submit", and we're not if ((!(JSRESOLVE_ASSIGNING & flags)) && JSVAL_IS_STRING(id)) {
// resolving for assignment, check if the form knows about the
// resolved string.
if ((!(JSRESOLVE_ASSIGNING & flags)) && JSVAL_IS_STRING(id) &&
id != sSubmit_id) {
nsCOMPtr<nsISupports> native; nsCOMPtr<nsISupports> native;
wrapper->GetNative(getter_AddRefs(native)); wrapper->GetNative(getter_AddRefs(native));
@ -6285,7 +6278,6 @@ nsEventListenerThisTranslator::TranslateThis(nsISupports *aInitialThis,
NS_ENSURE_TRUE(event, NS_ERROR_UNEXPECTED); NS_ENSURE_TRUE(event, NS_ERROR_UNEXPECTED);
nsCOMPtr<nsIDOMEventTarget> target; nsCOMPtr<nsIDOMEventTarget> target;
event->GetCurrentTarget(getter_AddRefs(target)); event->GetCurrentTarget(getter_AddRefs(target));
*_retval = target; *_retval = target;

Просмотреть файл

@ -259,7 +259,6 @@ protected:
static jsval sWindow_id; static jsval sWindow_id;
static jsval sFrames_id; static jsval sFrames_id;
static jsval sSelf_id; static jsval sSelf_id;
static jsval sSubmit_id;
static const JSClass *sObjectClass; static const JSClass *sObjectClass;