9 files changed, 343 insertions, 39 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 1c9d9d59..843db87c 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -169,6 +169,7 @@ 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.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
@@ -196,6 +197,11 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
         value:function(response){
             //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
+                    this.creatingNewFile = false;
+                }
+
                 //Sending full response object
                 this.openDocument(response);   
             } else if (!!response && (response.status === 404)){
diff --git a/js/panels/Timeline/Layer.reel/Layer.html b/js/panels/Timeline/Layer.reel/Layer.html
index a3fbd5b1..d30ef0e3 100644
--- a/js/panels/Timeline/Layer.reel/Layer.html
+++ b/js/panels/Timeline/Layer.reel/Layer.html
@@ -92,7 +92,140 @@
                                         "oneway" : false
                                 }
                         }
-                    }
+                    },
+                                "dtext-position-x" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "position-x"},
+                        "maxValue" : 100000,
+                        "minValue" : -100000,
+                        "acceptableUnits" : "px",
+                        "units" : "px",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextPositionX",
+                                "oneway": false
+                            }
+                        }
+                                },
+                                "dtext-position-y" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "position-y"},
+                        "maxValue" : 100000,
+                        "minValue" : -100000,
+                        "acceptableUnits" : "px",
+                        "units" : "px",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextPositionY",
+                                "oneway": false
+                            }
+                        }
+                                },
+                                "dtext-scale-x" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "scale-x"},
+                        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextScaleX",
+                                "oneway": false
+                            }
+                        }
+                                },
+                                "dtext-scale-y" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "scale-y"},
+                        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextScaleY",
+                                "oneway": false
+                            }
+                        }
+                                },
+                                "dtext-skew-x" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "skew-x"},
+                        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextSkewX",
+                                "oneway": false
+                            }
+                        }
+                                },
+                                "dtext-skew-y" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "skew-y"},
+                        "maxValue" : 100,
+                        "minValue" : 0,
+                        "acceptableUnits" : "%",
+                        "units" : "%",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextSkewY",
+                                "oneway": false
+                            }
+                        }
+                                },
+                                "dtext-rotate" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "rotation"},
+                        "maxValue" : 360,
+                        "minValue" : -360,
+                        "acceptableUnits" : "degrees",
+                        "units" : "degrees",
+                        "value" : 0
+                    },
+                        "bindings": {
+                            "value": {
+                                "boundObject": {"@": "owner"},
+                                "boundObjectPropertyPath": "dtextRotate",
+                                "oneway": false
+                            }
+                        }
+                                }
             }
         </script>
         </head>
@@ -114,15 +247,11 @@
                                         <div class="layout-table">
                                                 <div class="layout-row">
                                                         <div class="layout-cell">X</div>
-                                                        <div class="layout-cell">100px</div>
+                                                        <div class="layout-cell"><div id="position-x"></div></div>
                                                 </div>
                                                 <div class="layout-row">
                                                         <div class="layout-cell">Y</div>
-                                                        <div class="layout-cell">100px</div>
-                                                </div>
-                                                <div class="layout-row">
-                                                        <div class="layout-cell">Z</div>
-                                                        <div class="layout-cell">100px</div>
+                                                        <div class="layout-cell"><div id="position-y"></div></div>
                                                 </div>
                                         </div>
                                 </div>
@@ -134,23 +263,23 @@
                                         <div class="layout-table">
                                                 <div class="layout-row">