From 7ba13a2567bf480cfd415d6672f822065ea84605 Mon Sep 17 00:00:00 2001 From: "jst%netscape.com" Date: Tue, 10 Jul 2001 07:31:31 +0000 Subject: [PATCH] Fixing bug 88933, oriblems with setting event handlers on select elements from JS. r=hidday@geocities.com, sr=brendan@mozilla.org git-svn-id: svn://10.0.0.236/trunk@98981 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/dom/src/base/nsDOMClassInfo.cpp | 30 ++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp index fb0df92543c..9cae67714a4 100644 --- a/mozilla/dom/src/base/nsDOMClassInfo.cpp +++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -2644,23 +2644,23 @@ nsHTMLSelectElementSH::SetProperty(nsIXPConnectWrappedNative *wrapper, { int32 n = GetArrayIndexFromId(cx, id); - if (n < 0) { - return NS_OK; + if (n >= 0) { + nsCOMPtr native; + wrapper->GetNative(getter_AddRefs(native)); + + nsCOMPtr select(do_QueryInterface(native)); + NS_ENSURE_TRUE(select, NS_ERROR_UNEXPECTED); + + nsCOMPtr options; + select->GetOptions(getter_AddRefs(options)); + + nsCOMPtr oc(do_QueryInterface(options)); + NS_ENSURE_TRUE(oc, NS_ERROR_UNEXPECTED); + + return SetOption(cx, vp, n, oc); } - nsCOMPtr native; - wrapper->GetNative(getter_AddRefs(native)); - - nsCOMPtr select(do_QueryInterface(native)); - NS_ENSURE_TRUE(select, NS_ERROR_UNEXPECTED); - - nsCOMPtr options; - select->GetOptions(getter_AddRefs(options)); - - nsCOMPtr oc(do_QueryInterface(options)); - NS_ENSURE_TRUE(oc, NS_ERROR_UNEXPECTED); - - return SetOption(cx, vp, n, oc); + return nsElementSH::SetProperty(wrapper, cx, obj, id, vp, _retval); }