Merge remote-tracking branch 'ninja-jduran/Timeline' into Timeline-newdoc

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js

3 files changed, 27 insertions, 6 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 02031922..64ff2c7e 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -195,7 +195,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value:function(doc){
             var response = doc || null;//default just for testing
             if(!!response && response.success && (response.status!== 500) && !!response.uri){
+
+                this.isNewFilePath = true;//path identifier flag
                 this.creatingNewFile = true;//flag for timeline to identify new file flow
+
                 this.application.ninja.ioMediator.fileOpen(response.uri, this.openFileCallback.bind(this));
             }else if(!!response && !response.success){
                 //Todo: restrict directory path to the sandbox, in the dialog itself
@@ -224,9 +227,10 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
             //TODO: Add UI to handle error codes, shouldn't be alert windows
             if(!!response && (response.status === 204)) {
 
-                if((typeof this.creatingNewFile === 'undefined') || (this.creatingNewFile !== true)){//not from new file flow
+                if((typeof this.isNewFilePath === 'undefined') || (this.isNewFilePath !== true)){//not from new file flow
                     this.creatingNewFile = false;
                 }
+                this.isNewFilePath = false;//reset path identifier flag
 
                 //Sending full response object
                 this.openDocument(response);   
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 6a9e0140..67ff3c02 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -617,7 +617,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.arrTracks.splice(myIndex, 0, newTrack);
                     this.arrLayers.splice(myIndex, 0, thingToPush);
                     this._LayerUndoPosition = myIndex;
-//                    this.selectLayer(myIndex);
+                    this.selectLayer(myIndex);
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);
                     this.hashInstance.setItem(this._hashKey, thingToPush, myIndex);
                     this.hashTrackInstance.setItem(this._hashKey, newTrack, myIndex);
@@ -630,7 +630,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.hashLayerNumber.setItem(this._hashKey, thingToPush);
                     this.hashInstance.setItem(this._hashKey, thingToPush, thingToPush.layerPosition);
                     this.hashTrackInstance.setItem(this._hashKey, newTrack, newTrack.trackPosition);
-//                    this.selectLayer(0);
+                    this.selectLayer(0);
 
                 }
 
@@ -760,9 +760,21 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
     handleElementAdded:{
         value:function (event) {
+
             event.detail.uuid=nj.generateRandom();
-            this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected);
-            this.currentLayerSelected.elementsList.push(event.detail);
+            if(this.currentLayerSelected.elementsList[0]!==undefined){
+                if(this.currentTrackSelected.isTrackAnimated){
+                    this.application.ninja.stage.clearDrawingCanvas();
+                    alert("cannot add elements to a layer with animated element");/* check how to clear the canvas*/
+                    return;
+                }else{
+                    this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected);
+                    this.currentLayerSelected.elementsList.push(event.detail);
+                }
+            }else{
+                this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected);
+                this.currentLayerSelected.elementsList.push(event.detail);
+            }
 
         }
     },
@@ -986,7 +998,11 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                 this.currentTrackSelected = this.arrTracks[layerIndex];
                 if(!this._openDoc){
                     if(this._captureSelection){
-                        this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList)
+                        if(this.currentLayerSelected.elementsList.length >= 1){
+                            this.application.ninja.selectionController.selectElements(this.currentLayerSelected.elementsList);
+                        }else{
+                            this.application.ninja.selectionController.executeSelectElement();
+                        }
                     }
                     this._captureSelection = true;
                 }
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
index 43cd7477..bf97c0fd 100644
--- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
+++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
@@ -519,6 +519,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, {
                         i++;
                         this.nextKeyframe += 1;
                     }
+                    this.isTrackAnimated = true;
                 }
             }
             else{