Merge branch 'refs/heads/TimelineUberjd' into TimelineUber

Conflicts:
	js/controllers/elements/element-controller.js
	js/document/_toDelete/html-document.js
	js/panels/Timeline/Layer.reel/Layer.js

Signed-off-by: Kruti Shah <kruti.shah@motorola.com>

1 files changed, 0 insertions, 62 deletions

diff --git a/js/stage/stage-view.reel/stage-view.js b/js/stage/stage-view.reel/stage-view.js
deleted file mode 100755
index 2c129ee2..00000000
--- a/js/stage/stage-view.reel/stage-view.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/* <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> */
-
-/**
-@requires montage/core/core
-@requires montage/ui/component
-*/
-var Montage = require("montage/core/core").Montage,
-    Component = require("montage/ui/component").Component;
-
-exports.StageView = Montage.create(Component, {
-    _documents: {
-        value : []
-    },
-
-    docs: {
-        get: function() {
-            return this._documents;
-        },
-        set: function(value) {
-            //console.log(value);
-        }
-    },
-
-    didDraw:{
-        value: function() {
-            if(!this.application.ninja.documentController._textHolder) this.application.ninja.documentController._textHolder = this.element;
-        }
-    },
-
-    /**
-     * Public method
-     * Switches between documents. Document state data is saved and restored whereever applicable
-     */
-    switchDocument:{
-        value: function(doc){
-
-
-            //focus editor
-            if(!!this.application.ninja.documentController.activeDocument && !!this.application.ninja.documentController.activeDocument.editor){
-                this.application.ninja.documentController.activeDocument.editor.focus();
-
-                this.showCodeViewBar(true);
-                this.application.ninja.codeEditorController.applySettings();
-                this.collapseAllPanels();
-            }
-
-            if(this.application.ninja.documentController.activeDocument.currentView === "design") {
-                this.application.ninja.stage._scrollFlag = true; // TODO HACK to prevent type error on Hide/Show Iframe
-                this.application.ninja.stage.stageDeps.reinitializeForSwitchDocument();//reinitialize draw-util, snapmanager and view-util
-
-                this.showCodeViewBar(false);
-                this.restoreAllPanels();
-            }
-
-            NJevent("switchDocument");
-        }
-    }
-});
\ No newline at end of file