Reduce assumptions in examples

-dynamic scene, don't set duration on running animation (doesn't work)
-dynamic scene, just use set colors instead of system palette (in case
platform doesn't support it right, like N900)
-dynamic scene, calculator and shadereffects, don't rely on root item being
automatically in scope (possibly confusing)

Change-Id: I1eec018d5387424dc6b07bf51c1b2184b3048553
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>

2 files changed, 14 insertions, 14 deletions

diff --git a/examples/demos/calculator/CalculatorCore/calculator.js b/examples/demos/calculator/CalculatorCore/calculator.js
index e2b5692cf3..b4b0d9eea9 100644
--- a/examples/demos/calculator/CalculatorCore/calculator.js
+++ b/examples/demos/calculator/CalculatorCore/calculator.js
@@ -7,7 +7,7 @@ var timer = 0
 function disabled(op) {
     if (op == "." && display.text.toString().search(/\./) != -1) {
         return true
-    } else if (op == squareRoot &&  display.text.toString().search(/-/) != -1) {
+    } else if (op == window.squareRoot &&  display.text.toString().search(/-/) != -1) {
         return true
     } else {
         return false
@@ -16,9 +16,9 @@ function disabled(op) {
 
 function doOperation(op) {
     if (op == '*')//Keyboard Aliases
-        op = multiplication;
+        op = window.multiplication;
     if (op == '/')
-        op = division;
+        op = window.division;
     if (disabled(op)) {
         return
     }
@@ -40,14 +40,14 @@ function doOperation(op) {
         display.text = Number(display.text.valueOf()) + Number(curVal.valueOf())
     } else if (display.currentOperation.text == "-") {
         display.text = Number(curVal) - Number(display.text.valueOf())
-    } else if (display.currentOperation.text == multiplication) {
+    } else if (display.currentOperation.text == window.multiplication) {
         display.text = Number(curVal) * Number(display.text.valueOf())
-    } else if (display.currentOperation.text == division) {
+    } else if (display.currentOperation.text == window.division) {
         display.text = Number(Number(curVal) / Number(display.text.valueOf())).toString()
     } else if (display.currentOperation.text == "=") {
     }
 
-    if (op == "+" || op == "-" || op == multiplication || op == division) {
+    if (op == "+" || op == "-" || op == window.multiplication || op == window.division) {
         display.currentOperation.text = op
         curVal = display.text.valueOf()
         return
@@ -64,9 +64,9 @@ function doOperation(op) {
         display.text = (Math.abs(display.text.valueOf())).toString()
     } else if (op == "Int") {
         display.text = (Math.floor(display.text.valueOf())).toString()
-    } else if (op == plusminus) {
+    } else if (op == window.plusminus) {
         display.text = (display.text.valueOf() * -1).toString()
-    } else if (op == squareRoot) {
+    } else if (op == window.squareRoot) {
         display.text = (Math.sqrt(display.text.valueOf())).toString()
     } else if (op == "mc") {
         memory = 0;
@@ -76,7 +76,7 @@ function doOperation(op) {
         display.text = memory.toString()
     } else if (op == "m-") {
         memory = display.text.valueOf()
-    } else if (op == leftArrow) {
+    } else if (op == window.leftArrow) {
         display.text = display.text.toString().slice(0, -1)
         if (display.text.length == 0) {
             display.text = "0"
diff --git a/examples/demos/calculator/calculator-mobile.qml b/examples/demos/calculator/calculator-mobile.qml
index 7ee622f698..d042c756fc 100644
--- a/examples/demos/calculator/calculator-mobile.qml
+++ b/examples/demos/calculator/calculator-mobile.qml
@@ -95,7 +95,7 @@ Rectangle {
                 Row {
                     spacing: 6
                     Button { width: column.w; height: column.h; color: 'purple'; operation: "Off" }
-                    Button { width: column.w; height: column.h; color: 'purple'; operation: leftArrow }
+                    Button { width: column.w; height: column.h; color: 'purple'; operation: window.leftArrow }
                     Button { width: column.w; height: column.h; color: 'purple'; operation: "C" }
                     Button { width: column.w; height: column.h; color: 'purple'; operation: "AC" }
                 }
@@ -118,12 +118,12 @@ Rectangle {
                     Button { width: grid.w; height: column.h; operation: "7"; color: 'blue' }
                     Button { width: grid.w; height: column.h; operation: "8"; color: 'blue' }
                     Button { width: grid.w; height: column.h; operation: "9"; color: 'blue' }
-                    Button { width: grid.w; height: column.h; operation: division }
-                    Button { width: grid.w; height: column.h; operation: squareRoot }
+                    Button { width: grid.w; height: column.h; operation: window.division }
+                    Button { width: grid.w; height: column.h; operation: window.squareRoot }
                     Button { width: grid.w; height: column.h; operation: "4"; color: 'blue' }
                     Button { width: grid.w; height: column.h; operation: "5"; color: 'blue' }
                     Button { width: grid.w; height: column.h; operation: "6"; color: 'blue' }
-                    Button { width: grid.w; height: column.h; operation: multiplication }
+                    Button { width: grid.w; height: column.h; operation: window.multiplication }
                     Button { width: grid.w; height: column.h; operation: "x^2" }
                     Button { width: grid.w; height: column.h; operation: "1"; color: 'blue' }
                     Button { width: grid.w; height: column.h; operation: "2"; color: 'blue' }
@@ -132,7 +132,7 @@ Rectangle {
                     Button { width: grid.w; height: column.h; operation: "1/x" }
                     Button { width: grid.w; height: column.h; operation: "0"; color: 'blue' }
                     Button { width: grid.w; height: column.h; operation: "." }
-                    Button { width: grid.w; height: column.h; operation: plusminus }
+                    Button { width: grid.w; height: column.h; operation: window.plusminus }
                     Button { width: grid.w; height: column.h; operation: "+" }
                     Button { width: grid.w; height: column.h; operation: "="; color: 'red' }
                 }