Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 193223 : Make the add() method on html option collections

Browse Source 
more compatible with IE. r+sr=jst
This commit is contained in:
hpradhan%hotpop.com 2004-02-07 11:40:30 +00:00
parent 0e7fdf6f4a
commit de628eca3f
4 changed files with 120 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
content/html/content/src/nsHTMLSelectElement.cpp
View File

@ -2324,10 +2324,10 @@ nsHTMLOptionCollection::NamedItem(const nsAString& aName,
}
NS_IMETHODIMP
nsHTMLOptionCollection::Add(nsIDOMHTMLOptionElement *aOption)
nsHTMLOptionCollection::GetSelect(nsIDOMHTMLSelectElement **aReturn)
{
nsCOMPtr<nsIDOMNode> ret;
return mSelect->AppendChild(aOption, getter_AddRefs(ret));
NS_IF_ADDREF(*aReturn = mSelect);
return NS_OK;
}
nsresult

9
dom/public/idl/html/nsIDOMNSHTMLOptionCollectn.idl
View File

@ -41,9 +41,9 @@
#include "domstubs.idl"
interface nsIDOMHTMLOptionElement;
interface nsIDOMHTMLSelectElement;
[scriptable, uuid(409bbf14-1dd2-11b2-91de-8d672d406276)]
[scriptable, uuid(1181207B-2337-41a7-8DDF-FBE96461256F)]
interface nsIDOMNSHTMLOptionCollection : nsISupports
{
attribute long selectedIndex;
@ -51,8 +51,5 @@ interface nsIDOMNSHTMLOptionCollection : nsISupports
[noscript] void setOption(in long index,
in nsIDOMHTMLOptionElement option);
// The following exists to give us partial compatibility with the
// add method as it exists in IE (we don't yet support the second
// argument)
void add(in nsIDOMHTMLOptionElement option);
[noscript] readonly attribute nsIDOMHTMLSelectElement select;
};

106
dom/src/base/nsDOMClassInfo.cpp
View File

@ -143,6 +143,7 @@
#include "nsIDOMNSHTMLOptionElement.h"
#include "nsIDOMHTMLOptionsCollection.h"
#include "nsIDOMNSHTMLOptionCollectn.h"
#include "nsIDOMHTMLOptionsCollection.h"
// ContentList includes
#include "nsIContentList.h"
@ -909,6 +910,7 @@ jsval nsDOMClassInfo::sWindow_id = JSVAL_VOID;
jsval nsDOMClassInfo::sFrames_id = JSVAL_VOID;
jsval nsDOMClassInfo::sSelf_id = JSVAL_VOID;
jsval nsDOMClassInfo::sOpener_id = JSVAL_VOID;
jsval nsDOMClassInfo::sAdd_id = JSVAL_VOID;
const JSClass *nsDOMClassInfo::sObjectClass = nsnull;
@ -1012,6 +1014,7 @@ nsDOMClassInfo::DefineStaticJSVals(JSContext *cx)
SET_JSVAL_TO_STRING(sFrames_id, cx, "frames");
SET_JSVAL_TO_STRING(sSelf_id, cx, "self");
SET_JSVAL_TO_STRING(sOpener_id, cx, "opener");
SET_JSVAL_TO_STRING(sAdd_id, cx, "add");
return NS_OK;
}
@ -6202,6 +6205,109 @@ nsHTMLOptionsCollectionSH::SetProperty(nsIXPConnectWrappedNative *wrapper,
return nsHTMLSelectElementSH::SetOption(cx, vp, n, oc);
}
NS_IMETHODIMP
nsHTMLOptionsCollectionSH::NewResolve(nsIXPConnectWrappedNative *wrapper,
JSContext *cx, JSObject *obj,
jsval id, PRUint32 flags,
JSObject **objp, PRBool *_retval)
{
if (id == sAdd_id) {
JSString *str = JSVAL_TO_STRING(id);
JSFunction *fnc =
::JS_DefineFunction(cx, obj, ::JS_GetStringBytes(str),
Add, 0, JSPROP_ENUMERATE);
*objp = obj;
return fnc ? NS_OK : NS_ERROR_UNEXPECTED;
}
return nsHTMLCollectionSH::NewResolve(wrapper, cx, obj, id, flags, objp, _retval);
}
JSBool JS_DLL_CALLBACK
nsHTMLOptionsCollectionSH::Add(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval)
{
*rval = JSVAL_VOID;
nsCOMPtr<nsIXPConnectWrappedNative> wrapper;
nsresult rv =
sXPConnect->GetWrappedNativeOfJSObject(cx, obj, getter_AddRefs(wrapper));
if (NS_FAILED(rv)) {
nsDOMClassInfo::ThrowJSException(cx, rv);
return JS_FALSE;
}
nsCOMPtr<nsISupports> native;
rv = wrapper->GetNative(getter_AddRefs(native));
NS_ENSURE_SUCCESS(rv, JS_FALSE);
nsCOMPtr<nsIDOMHTMLOptionsCollection> options(do_QueryInterface(native));
NS_ASSERTION(options, "native should have been an options collection");
if (argc < 1 || !JSVAL_IS_OBJECT(argv[0])) {
nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_XPC_NOT_ENOUGH_ARGS);
return JS_FALSE;
}
rv = sXPConnect->GetWrappedNativeOfJSObject(cx, JSVAL_TO_OBJECT(argv[0]),
getter_AddRefs(wrapper));
if (NS_FAILED(rv)) {
nsDOMClassInfo::ThrowJSException(cx, rv);
return JS_FALSE;
}
rv = wrapper->GetNative(getter_AddRefs(native));
NS_ENSURE_SUCCESS(rv, JS_FALSE);
nsCOMPtr<nsIDOMHTMLOptionElement> newOption(do_QueryInterface(native));
if (!newOption) {
nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_DOM_WRONG_TYPE_ERR);
return JS_FALSE;
}
int32 index = -1;
if (argc > 1) {
if (!JS_ValueToInt32(cx, argv[1], &index)) {
return JS_FALSE;
}
}
if (index < -1) {
nsDOMClassInfo::ThrowJSException(cx, NS_ERROR_DOM_INDEX_SIZE_ERR);
return JS_FALSE;
}
PRUint32 length;
options->GetLength(&length);
if (index == -1 || index > (int32)length) {
// IE appends in these cases
index = length;
}
nsCOMPtr<nsIDOMNode> beforeNode;
options->Item(index, getter_AddRefs(beforeNode));
nsCOMPtr<nsIDOMHTMLOptionElement> beforeElement(do_QueryInterface(beforeNode));
nsCOMPtr<nsIDOMNSHTMLOptionCollection> nsoptions(do_QueryInterface(options));
nsCOMPtr<nsIDOMHTMLSelectElement> select;
nsoptions->GetSelect(getter_AddRefs(select));
rv = select->Add(newOption, beforeElement);
if (NS_FAILED(rv)) {
nsDOMClassInfo::ThrowJSException(cx, rv);
}
return NS_SUCCEEDED(rv);
}
// Plugin helper

9
dom/src/base/nsDOMClassInfo.h
View File

@ -260,6 +260,7 @@ protected:
static jsval sFrames_id;
static jsval sSelf_id;
static jsval sOpener_id;
static jsval sAdd_id;
static const JSClass *sObjectClass;
@ -882,10 +883,16 @@ protected:
{
}
static JSBool JS_DLL_CALLBACK Add(JSContext *cx, JSObject *obj, uintN argc,
jsval *argv, jsval *rval);
public:
NS_IMETHOD SetProperty(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsval id, jsval *vp, PRBool *_retval);
NS_IMETHOD NewResolve(nsIXPConnectWrappedNative *wrapper, JSContext *cx,
JSObject *obj, jsval id, PRUint32 flags,
JSObject **objp, PRBool *_retval);
static nsIClassInfo *doCreate(nsDOMClassInfoData* aData)
{
return new nsHTMLOptionsCollectionSH(aData);