Merge branch 'refs/heads/master' into text-tool

1 files changed, 812 insertions, 215 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 9bf51e60..44129743 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -1,295 +1,892 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
-var TimelineController = require("js/panels/Timeline/TimelineController").TimelineController;
+var Layer = require("js/panels/Timeline/Layer.reel").Layer;
+var TimelineTrack = require("js/panels/Timeline/TimelineTrack.reel").TimelineTrack;
+var nj = require("js/lib/NJUtils").NJUtils;
+var ElementMediator = require("js/mediators/element-mediator").ElementMediator;
 
 var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
 
-    tmpImg: { value: null},
+    hasTemplate:{
+        value:true
+    },
 
-    templateDidLoad: {
-        value: function() {
-            /*
-            this.tmpImg = document.createElement("img");
-            this.tmpImg.width = 1879;
-            this.tmpImg.height = 440;
-            this.tmpImg.src = "images/timeline/timeline.png";
-            */
+    /* === BEGIN: Models === */
+    _arrLayers:{
+        value:[]
+    },
+
+    arrLayers:{
+        get:function () {
+            return this._arrLayers;
+        },
+        set:function (newVal) {
+            this._arrLayers = newVal;
         }
     },
 
-    prepareForDraw: {
-        value: function() {
-            this.element.style.background = "url('images/timeline/timeline.png')";
-            this.element.style.width = "100%";
-            this.element.style.height = "400px";
-            this.element.style.backgroundPosition = "-5px -40px";
+    _layerRepetition:{
+        value:null
+    },
+
+    layerRepetition:{
+        get:function () {
+            return this._layerRepetition;
+        },
+        set:function (newVal) {
+            this._layerRepetition = newVal;
         }
     },
 
-    init : {
-        value : function()
-        {
-            this.buildTimelineView();
+    _currentLayerNumber:{
+        value:0
+    },
 
+    currentLayerNumber:{
+        get:function () {
+            return this._currentLayerNumber;
+        },
+        set:function (newVal) {
+            if (newVal !== this._currentLayerNumber) {
+                this._currentLayerNumber = newVal;
+            }
         }
     },
 
-    breadCrumbContainer:{
-        value:null,
-        writable:true,
-        enumerable:true
+    currentLayerSelected:{
+        value: null
     },
 
-    controlsContainer:{
-        value:null,
-        writable:true,
-        enumerable:true
+    currentTrackSelected:{
+        value: null
     },
 
-    timelineGutter:{
-        value:null,
-        writable:true,
-        enumerable:true
+    millisecondsOffset:{
+        value:1000
     },
 
-    userLayerContainer:{
-        value:null,
-        writable:true,
-        enumerable:true
+    _arrTracks:{
+        serializable:true,
+        value:[]
     },
 
-    currentLayerNumber:{
-        value:1,
-        writable:true,
-        enumerable:true
+    arrTracks:{
+        serializable:true,
+        get:function () {
+            return this._arrTracks;
+        },
+        set:function (newVal) {
+            this._arrTracks = newVal;
+        }
     },
 
-    newLayerButton:{
-        value:null,
-        writable:true,
-        enumerable:true
+    _trackRepetition:{
+        serializable:true,
+        value:null
     },
 
-    deleteLayerButton:{
-        value:null,
-        writable:true,
-        enumerable:true
+    trackRepetition:{
+        serializable:true,
+        get:function () {
+            return this._trackRepetition;
+        },
+        set:function (newVal) {
+            this._trackRepetition = newVal;
+        }
     },
 
-    newFolderButton:{
-        value:null,
-        writable:true,
-        enumerable:true
+    _selectedKeyframes:{
+        value:[]
     },
 
-    buildTimelineView : {
-        value:function(){
-            var timeline = document.getElementById("timelinePanel");
-
-            var mainTimelineContainer = document.createElement("div");
-            mainTimelineContainer.style.backgroundColor = "#000000";
-            mainTimelineContainer.style.width = "100%";
-            mainTimelineContainer.style.height = "100%";
-            mainTimelineContainer.style.overflow = "visible";
-
-            timeline.appendChild(mainTimelineContainer);
-
-            this.breadCrumbContainer = document.createElement("div");
-            this.breadCrumbContainer.style.width = "100%";
-            this.breadCrumbContainer.style.height = "20px";
-            this.breadCrumbContainer.style.backgroundColor = "#111111";
-
-            var timeControllerContainer = document.createElement("div");
-            timeControllerContainer.style.width = "auto";
-            timeControllerContainer.style.height = "20px";
-            timeControllerContainer.style.backgroundColor = "#000000";
-
-            this.controlsContainer = document.createElement("div");
-            this.controlsContainer.style.width = "200px";
-            this.controlsContainer.style.height = "20px";
-            this.controlsContainer.style.backgroundColor = "#440000";
-            this.controlsContainer.style.float = "left";
-            this.controlsContainer.innerText = "Timeline Controller";
-
-            var timeContainer = document.createElement("div");
-            timeContainer.style.width = "inherit";
-            timeContainer.style.height = "20px";
-            timeContainer.style.backgroundColor = "#880000";
-            timeContainer.style.float = "left";
-            timeContainer.innerText = "Time markers";
-
-            timeControllerContainer.appendChild(this.controlsContainer);
-            timeControllerContainer.appendChild(timeContainer);
-
-            var masterLayerContainer = document.createElement("div");
-            masterLayerContainer.style.width = "100%";
-            masterLayerContainer.style.height = "20px";
-            masterLayerContainer.style.backgroundColor = "#111111";
-            masterLayerContainer.style.border = "solid";
-            masterLayerContainer.style.borderWidth = "thin";
-            masterLayerContainer.style.borderColor = "#333333";
-            masterLayerContainer.innerText = "MASTER Layer";
+    selectedKeyframes:{
+        serializable:true,
+        get:function () {
+            return this._selectedKeyframes;
+        },
+        set:function (newVal) {
+            this._selectedKeyframes = newVal;