Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements

Conflicts:
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/js/document/html-document.js b/js/document/html-document.js
index 2531465d..3876670c 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -330,6 +330,10 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                         elementModel.pi = "BrushStrokePi";
                                                 break;
 
+                    case root.GEOM_TYPE_CUBIC_BEZIER:
+                        elementModel.selection = "Subpath";
+                        elementModel.pi = "SubpathPi";
+                        break;
 
                                         default:
                                                 console.log( "geometry type not supported for file I/O, " + root.geomType());
@@ -404,7 +408,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
             this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"];
             this.currentView = "design";
                         //
-                        this.iframe.src = this._htmlTemplateUrl;
+
+            this.iframe.src = this._htmlTemplateUrl;
             this.iframe.addEventListener("load", this, true);
         }
     },
@@ -528,8 +533,6 @@ exports.HTMLDocument = Montage.create(TextDocument, {
                 value: 0
         },
 */
-        
-        
         ////////////////////////////////////////////////////////////////////
         //
     handleEvent: {
@@ -827,7 +830,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
     // Setting up the currentSelectedContainer to the document body.
     userTemplateDidLoad: {
         value: function(){
-            this.application.ninja.currentSelectedContainer = this.documentRoot;
+            //this.application.ninja.currentSelectedContainer = this.documentRoot;
         }
     },