Merge branch 'refs/heads/NINJAmaster' into TimelineUber

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

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 46 insertions, 2 deletions

diff --git a/js/document/views/base.js b/js/document/views/base.js
index 50c0a78d..d13dce1a 100755
--- a/js/document/views/base.js
+++ b/js/document/views/base.js
@@ -7,15 +7,59 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 ////////////////////////////////////////////////////////////////////////
 //
 var Montage =   require("montage/core/core").Montage,
-        Component = require("montage/ui/component").Component;
+        Component = require("montage/ui/component").Component,
+        UrlParser = require("js/document/helpers/url-parser").UrlParser;
 ////////////////////////////////////////////////////////////////////////
 //      
 exports.BaseDocumentView = Montage.create(Component, {
         ////////////////////////////////////////////////////////////////////
         //
         hasTemplate: {
-                enumerable: false,
         value: false
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        urlParser: {
+        value: UrlParser
+    },
+        ////////////////////////////////////////////////////////////////////
+        //
+        _iframe: {
+        value: null
+    },
+    ////////////////////////////////////////////////////////////////////
+        //TODO: This should be renamed to better illustrate it's a container (iframe for design, div for code view)
+        iframe: {
+                get: function() {return this._iframe;},
+        set: function(value) {this._iframe= value;}
+    },
+        ////////////////////////////////////////////////////////////////////
+        //
+        show: {
+        value: function (callback) {
+                if (this.iframe) {
+                        this.iframe.style.display = 'block';
+                this.iframe.style.opacity = 1;
+                } else {
+                        console.log('Error: View has no iframe to show!');
+                }
+                //
+                if (callback) callback();
+        }
+    },
+    ////////////////////////////////////////////////////////////////////
+        //
+        hide: {
+        value: function (callback) {
+                if (this.iframe) {
+                        this.iframe.style.display = 'none';
+                this.iframe.style.opacity = 0;
+                } else {
+                        console.log('Error: View has no iframe to hide!');
+                }
+                //
+                if (callback) callback();
+        }
     }
         ////////////////////////////////////////////////////////////////////
         ////////////////////////////////////////////////////////////////////