diff options
author | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-04-25 13:34:04 -0700 |
commit | 32a24988add5ba0ecf80caa31871cdd90e3eea5b (patch) | |
tree | fbf05f2dfc91e57ab9598046ff16798ea0ae1966 /js/document/html-document.js | |
parent | 60d6346a78fb5257eaf36f17a5fcb764a342c012 (diff) | |
parent | d3a6350163ada5644d34ed8d5c2a00cef4db2afc (diff) | |
download | ninja-32a24988add5ba0ecf80caa31871cdd90e3eea5b.tar.gz |
Merge branch 'refs/heads/ninja-internal' into WebGLMaterials
Diffstat (limited to 'js/document/html-document.js')
-rwxr-xr-x | js/document/html-document.js | 11 |
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, { | |||
330 | elementModel.pi = "BrushStrokePi"; | 330 | elementModel.pi = "BrushStrokePi"; |
331 | break; | 331 | break; |
332 | 332 | ||
333 | case root.GEOM_TYPE_CUBIC_BEZIER: | ||
334 | elementModel.selection = "Subpath"; | ||
335 | elementModel.pi = "SubpathPi"; | ||
336 | break; | ||
333 | 337 | ||
334 | default: | 338 | default: |
335 | console.log( "geometry type not supported for file I/O, " + root.geomType()); | 339 | console.log( "geometry type not supported for file I/O, " + root.geomType()); |
@@ -404,7 +408,8 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
404 | this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"]; | 408 | this.selectionExclude = ["HTML", "BODY", "Viewport", "UserContent", "stageBG"]; |
405 | this.currentView = "design"; | 409 | this.currentView = "design"; |
406 | // | 410 | // |
407 | this.iframe.src = this._htmlTemplateUrl; | 411 | |
412 | this.iframe.src = this._htmlTemplateUrl; | ||
408 | this.iframe.addEventListener("load", this, true); | 413 | this.iframe.addEventListener("load", this, true); |
409 | } | 414 | } |
410 | }, | 415 | }, |
@@ -528,8 +533,6 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
528 | value: 0 | 533 | value: 0 |
529 | }, | 534 | }, |
530 | */ | 535 | */ |
531 | |||
532 | |||
533 | //////////////////////////////////////////////////////////////////// | 536 | //////////////////////////////////////////////////////////////////// |
534 | // | 537 | // |
535 | handleEvent: { | 538 | handleEvent: { |
@@ -827,7 +830,7 @@ exports.HTMLDocument = Montage.create(TextDocument, { | |||
827 | // Setting up the currentSelectedContainer to the document body. | 830 | // Setting up the currentSelectedContainer to the document body. |
828 | userTemplateDidLoad: { | 831 | userTemplateDidLoad: { |
829 | value: function(){ | 832 | value: function(){ |
830 | this.application.ninja.currentSelectedContainer = this.documentRoot; | 833 | //this.application.ninja.currentSelectedContainer = this.documentRoot; |
831 | } | 834 | } |
832 | }, | 835 | }, |
833 | 836 | ||