diff --git a/src/ecmascript/spidermonkey/element.c b/src/ecmascript/spidermonkey/element.c index 91d221273..7d49d9425 100644 --- a/src/ecmascript/spidermonkey/element.c +++ b/src/ecmascript/spidermonkey/element.c @@ -46,6 +46,11 @@ #include "viewer/text/link.h" #include "viewer/text/vs.h" +#include +#include +#include + + using namespace htmlcxx; static bool element_get_property_id(JSContext *ctx, unsigned int argc, JS::Value *vp); @@ -54,6 +59,7 @@ static bool element_get_property_innerHtml(JSContext *ctx, unsigned int argc, JS static bool element_set_property_innerHtml(JSContext *ctx, unsigned int argc, JS::Value *vp); static bool element_get_property_outerHtml(JSContext *ctx, unsigned int argc, JS::Value *vp); static bool element_set_property_outerHtml(JSContext *ctx, unsigned int argc, JS::Value *vp); +static bool element_get_property_tagName(JSContext *ctx, unsigned int argc, JS::Value *vp); static bool element_get_property_title(JSContext *ctx, unsigned int argc, JS::Value *vp); static bool element_set_property_title(JSContext *ctx, unsigned int argc, JS::Value *vp); @@ -73,6 +79,7 @@ JSPropertySpec element_props[] = { JS_PSGS("id", element_get_property_id, element_set_property_id, JSPROP_ENUMERATE), JS_PSGS("innerHTML", element_get_property_innerHtml, element_set_property_innerHtml, JSPROP_ENUMERATE), JS_PSGS("outerHTML", element_get_property_outerHtml, element_set_property_outerHtml, JSPROP_ENUMERATE), + JS_PSG("tagName", element_get_property_tagName, JSPROP_ENUMERATE), JS_PSGS("title", element_get_property_title, element_set_property_title, JSPROP_ENUMERATE), JS_PS_END }; @@ -120,6 +127,48 @@ element_get_property_id(JSContext *ctx, unsigned int argc, JS::Value *vp) return true; } +static bool +element_get_property_tagName(JSContext *ctx, unsigned int argc, JS::Value *vp) +{ + JS::CallArgs args = CallArgsFromVp(argc, vp); + JS::RootedObject hobj(ctx, &args.thisv().toObject()); + + struct view_state *vs; + JSCompartment *comp = js::GetContextCompartment(ctx); + + if (!comp) { + return false; + } + + struct ecmascript_interpreter *interpreter = JS_GetCompartmentPrivate(comp); + + /* This can be called if @obj if not itself an instance of the + * appropriate class but has one in its prototype chain. Fail + * such calls. */ + if (!JS_InstanceOf(ctx, hobj, &element_class, NULL)) + return false; + + vs = interpreter->vs; + if (!vs) { + return false; + } + + tree *el = JS_GetPrivate(hobj); + + if (!el) { + args.rval().setNull(); + return true; + } + + tree::iterator it = el->begin(); + std::string v = it->tagName(); + std::transform(v.begin(), v.end(), v.begin(), ::toupper); + + args.rval().setString(JS_NewStringCopyZ(ctx, v.c_str())); + + return true; +} + static bool element_get_property_title(JSContext *ctx, unsigned int argc, JS::Value *vp) { diff --git a/test/ecmascript/tagName.html b/test/ecmascript/tagName.html new file mode 100644 index 000000000..fdd5eb02d --- /dev/null +++ b/test/ecmascript/tagName.html @@ -0,0 +1,17 @@ + + +BBB + + +AAAUUUAAAAAAA + +BB + + + +