alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

able to fetch property animation; was missing in js relative to the c++

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1073568
This commit is contained in:
Aaron J. Seigo 2010-01-12 11:16:33 +00:00
parent 1ea98c3161
commit c3b9c61da1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -427,7 +427,8 @@ QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptE
populateAnimationsHash(); populateAnimationsHash();
QString animName = context->argument(0).toString().toLower(); QString animName = context->argument(0).toString().toLower();
const bool isPause = animName == "pause"; const bool isPause = animName == "pause";
if (!isPause && !s_animationDefs.contains(animName)) { const bool isProperty = animName == "property";
if (!isPause && !isProperty && !s_animationDefs.contains(animName)) {
return context->throwError(i18n("%1 is not a known animation type", animName)); return context->throwError(i18n("%1 is not a known animation type", animName));
} }
@ -436,6 +437,9 @@ QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptE
if (isPause) { if (isPause) {
QPauseAnimation *pause = new QPauseAnimation(parent); QPauseAnimation *pause = new QPauseAnimation(parent);
return engine->newQObject(pause); return engine->newQObject(pause);
} else if (isProperty) {
QPropertyAnimation *propertyAnim = new QPropertyAnimation(parent);
return engine->newQObject(propertyAnim);
} else { } else {
Plasma::Animation *anim = Plasma::Animator::create(s_animationDefs.value(animName), parent); Plasma::Animation *anim = Plasma::Animator::create(s_animationDefs.value(animName), parent);
if (anim) { if (anim) {