4 files changed, 68 insertions, 40 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index fa611de4..1c9d9d59 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -84,8 +84,13 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         //
     handleAppLoaded: {
         value: function() {
-            //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
-            if (window.chrome.app.isInstalled) {
+            //Checking for app to be loaded through extension
+            var check;
+            if (chrome && chrome.app) {
+                check = chrome.app.getDetails();
+            }
+            if (check !== null) {
+                //Adding an intercept to resources loaded to ensure user assets load from cloud simulator
                 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
             }
         }
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index 0282060f..a4bf9baa 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -162,15 +162,17 @@ exports.KeyboardMediator = Montage.create(Component, {
                     return;
                 }
 
+                // Hand tool
                 if(evt.keyCode === Keyboard.H ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]});
                     return;
                 }
 
+                // Zoom tool
                 if(evt.keyCode === Keyboard.Z ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[16]});
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
                     return;
                 }
 
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index fddfd170..61da9e36 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -358,9 +358,11 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
 
     didDraw:{
         value:function () {
-            if (this._openDocRedrawCheck) {
-                this.retrieveStoredTweens();
-                this._openDocRedrawCheck = false;
+            if(this.application.ninja.currentDocument.documentRoot.children[0]){
+                if (this._openDocRedrawCheck) {
+                    this.retrieveStoredTweens();
+                    this._openDocRedrawCheck = false;
+                }
             }
         }
     },
@@ -459,42 +461,48 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
             this.animatedElement = this.application.ninja.timeline.arrLayers[this.trackID - 1].elementsList[0];
             this.animationName = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-name");
             this.animationDuration = this.application.ninja.stylesController.getElementStyle(this.animatedElement, "-webkit-animation-duration");
-            this.trackDuration = this.animationDuration.split("s");
-            this.currentMilliSec = this.trackDuration[0] * 1000;
-            this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
-            this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
-            this.nextKeyframe = 0;
-
-            this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);
-            while (this.currentKeyframeRule[i]) {
-                var newTween = {};
-                if (this.currentKeyframeRule[i].keyText === "0%") {
-                    newTween.spanWidth = 0;
-                    newTween.keyFramePosition = 0;
-                    newTween.keyFrameMillisec = 0;
-                    newTween.tweenID = 0;
-                    newTween.spanPosition = 0;
-                    this.tweens.push(newTween);
+            if(this.animationDuration){
+                this.trackDuration = this.animationDuration.split("s");
+                this.currentMilliSec = this.trackDuration[0] * 1000;
+                this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+                this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
+                this.nextKeyframe = 0;
+
+                this.currentKeyframeRule = this.application.ninja.stylesController.getAnimationRuleWithName(this.animationName, this.application.ninja.currentDocument._document);
+                while (this.currentKeyframeRule[i]) {
+                    var newTween = {};
+
+                    if (this.currentKeyframeRule[i].keyText === "0%") {
+                        newTween.spanWidth = 0;
+                        newTween.keyFramePosition = 0;
+                        newTween.keyFrameMillisec = 0;
+                        newTween.tweenID = 0;
+                        newTween.spanPosition = 0;
+                        this.tweens.push(newTween);
 
-                }
-                else {
-                    percentValue = this.currentKeyframeRule[i].keyText;
-                    splitValue = percentValue.split("%");
-                    fraction = splitValue[0] / 100;
-                    this.currentMilliSec = fraction * this.trackDuration[0] * 1000;
-                    this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
-                    this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
-                    newTween.spanWidth = this.clickPos - this.tweens[this.tweens.length - 1].keyFramePosition;
-                    newTween.keyFramePosition = this.clickPos;
-                    newTween.keyFrameMillisec = this.currentMilliSec;
-                    newTween.tweenID = this.nextKeyframe;
-                    newTween.spanPosition = this.clickPos - newTween.spanWidth;
-                    this.tweens.push(newTween);
+                    }
+                    else {
+                        percentValue = this.currentKeyframeRule[i].keyText;
+                        splitValue = percentValue.split("%");
+                        fraction = splitValue[0] / 100;
+                        this.currentMilliSec = fraction * this.trackDuration[0] * 1000;
+                        this.currentMillisecPerPixel = Math.floor(this.application.ninja.timeline.millisecondsOffset / 80);
+                        this.clickPos = this.currentMilliSec / this.currentMillisecPerPixel;
+                        newTween.spanWidth = this.clickPos - this.tweens[this.tweens.length - 1].keyFramePosition;
+                        newTween.keyFramePosition = this.clickPos;
+                        newTween.keyFrameMillisec = this.currentMilliSec;
+                        newTween.tweenID = this.nextKeyframe;
+                        newTween.spanPosition = this.clickPos - newTween.spanWidth;
+                        this.tweens.push(newTween);
 
 
+                    }
+                    i++;
+                    this.nextKeyframe += 1;
                 }
-                i++;
-                this.nextKeyframe += 1;
+            }
+            else{
+                return;
             }
         }
     },
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 9b6416c7..8fa33a75 100755
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -255,6 +255,12 @@ exports.Content = Montage.create(Component, {
 
                             if(currentValue)
                             {
+                                if(currentValue.color)
+                                {
+                                    currentValue.color.wasSetByCode = true;
+                                    currentValue.color.type = "change";
+                                }
+
                                 if(currentValue.mode === "gradient")
                                 {
                                     this.application.ninja.colorController.colorModel["gradient"] =
@@ -267,7 +273,14 @@ exports.Content = Montage.create(Component, {
                                         this.application.ninja.colorController.colorModel.alpha =
                                                         {value: currentValue.color.a, wasSetByCode: true, type: 'change'};
                                     }
-                                    this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
+                                    if(currentValue.color.mode)
+                                    {
+                                        this.application.ninja.colorController.colorModel[currentValue.color.mode] = currentValue.color;
+                                    }
+                                    else
+                                    {
+                                        this.application.ninja.colorController.colorModel["rgb"] = currentValue.color;
+                                    }
                                 }
                             }
                             else