qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't enumerate Function.prototype.{connect,disconnect} 

QML/JS adds connect and disconnect methods to the standard
Function.prototype object.
Follow the convention of ECMA-262: Function properties should
be non-enumerable.
In particular, we don't want such built-in properties to show
up in user code "for-in" statements.

Task-number: QTBUG-21120
Change-Id: I416106badf35daddf32e16f757d37b2b09e58310
Reviewed-on: http://codereview.qt.nokia.com/3587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
This commit is contained in:
Kent Hansen 2011-08-25 12:51:03 +02:00 committed by Qt by Nokia
parent 6dd1ab81e1
commit 46af4afe0c
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/declarative/qml/v8/qv8qobjectwrapper.cpp
View File

@ -280,8 +280,8 @@ void QV8QObjectWrapper::init(QV8Engine *engine)
{
v8::Local<v8::Object> prototype = engine->global()->Get(v8::String::New("Function"))->ToObject()->Get(v8::String::New("prototype"))->ToObject();
prototype->Set(v8::String::New("connect"), V8FUNCTION(Connect, engine));
prototype->Set(v8::String::New("disconnect"), V8FUNCTION(Disconnect, engine));
prototype->Set(v8::String::New("connect"), V8FUNCTION(Connect, engine), v8::DontEnum);
prototype->Set(v8::String::New("disconnect"), V8FUNCTION(Disconnect, engine), v8::DontEnum);
}
}

19
tests/auto/declarative/qjsengine/tst_qjsengine.cpp
View File

@ -325,6 +325,7 @@ private slots:
void dateRoundtripQtJSQt();
void dateConversionJSQt();
void dateConversionQtJS();
void functionPrototypeExtensions();
};
tst_QJSEngine::tst_QJSEngine()
@ -6478,6 +6479,24 @@ void tst_QJSEngine::scriptValueFromQMetaObject()
}
#endif
void tst_QJSEngine::functionPrototypeExtensions()
{
// QJS adds connect and disconnect properties to Function.prototype.
QJSEngine eng;
QJSValue funProto = eng.globalObject().property("Function").property("prototype");
QVERIFY(funProto.isFunction());
QVERIFY(funProto.property("connect").isFunction());
QCOMPARE(funProto.propertyFlags("connect"), QJSValue::SkipInEnumeration);
QVERIFY(funProto.property("disconnect").isFunction());
QCOMPARE(funProto.propertyFlags("disconnect"), QJSValue::SkipInEnumeration);
// No properties should appear in for-in statements.
QJSValue props = eng.evaluate("props = []; for (var p in Function.prototype) props.push(p); props");
QVERIFY(!eng.hasUncaughtException());
QVERIFY(props.isArray());
QCOMPARE(props.property("length").toInt32(), 0);
}
QTEST_MAIN(tst_QJSEngine)
#include "tst_qjsengine.moc"