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

hook up the JS engine to the JS animation support, and don't make animation loading failure a fatal error

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1126036
This commit is contained in:
Aaron J. Seigo 2010-05-13 00:53:49 +00:00
parent d1451eeca0
commit 5b66232873
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scriptengines/javascript/simplejavascriptapplet.cpp
View File

@ -664,7 +664,8 @@ QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptE
}
populateAnimationsHash();
QString animName = context->argument(0).toString().toLower();
QString name = context->argument(0).toString();
QString animName = name.toLower();
const bool isPause = animName == "pause";
const bool isProperty = animName == "property";
@ -679,7 +680,15 @@ QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptE
} else if (s_animationDefs.contains(animName)) {
plasmaAnim = Plasma::Animator::create(s_animationDefs.value(animName), parent);
} else {
plasmaAnim = Plasma::Animator::create(animName, parent);
SimpleJavaScriptApplet *jsApplet = qobject_cast<SimpleJavaScriptApplet *>(engine->parent());
if (jsApplet) {
//kDebug() << "trying to load it from the package";
plasmaAnim = jsApplet->loadAnimationFromPackage(name, parent);
}
if (!plasmaAnim) {
plasmaAnim = Plasma::Animator::create(animName, parent);
}
}
if (plasmaAnim) {
@ -695,7 +704,13 @@ QScriptValue SimpleJavaScriptApplet::animation(QScriptContext *context, QScriptE
return value;
}
return context->throwError(i18n("%1 is not a known animation type", animName));
context->throwError(i18n("%1 is not a known animation type", animName));
ScriptEnv *env = ScriptEnv::findScriptEnv(engine);
if (env) {
env->checkForErrors(false);
}
return engine->undefinedValue();
}
QScriptValue SimpleJavaScriptApplet::animationGroup(QScriptContext *context, QScriptEngine *engine)