aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rwxr-xr-xjs/controllers/document-controller.js25
-rwxr-xr-xjs/document/html-document.js13
-rwxr-xr-xjs/document/templates/montage-html/default_html.css75
-rwxr-xr-xjs/document/templates/montage-html/index.html50
-rw-r--r--js/document/templates/montage-html/main.reel/main.js54
-rwxr-xr-xjs/document/templates/montage-html/package.json8
-rwxr-xr-xjs/document/templates/montage-html/styles.css5
-rw-r--r--js/io/system/ninjalibrary.js2
-rw-r--r--js/io/system/ninjalibrary.json3
-rw-r--r--js/mediators/io-mediator.js21
10 files changed, 241 insertions, 15 deletions
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index b1a22c1b..9785d824 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -56,12 +56,37 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
56 this.eventManager.addEventListener("executeSave", this, false); 56 this.eventManager.addEventListener("executeSave", this, false);
57 57
58 this.eventManager.addEventListener("recordStyleChanged", this, false); 58 this.eventManager.addEventListener("recordStyleChanged", this, false);
59
60
61
59 } 62 }
60 }, 63 },
64
65
66 handleWebRequest: {
67 value: function (request) {
68 if (request.url.indexOf('js/document/templates/montage-html') !== -1) {
69
70 console.log(request);
71
72 //TODO: Figure out why active document is not available here
73
74 /*
75if (request.url.indexOf('calculator.css') !== -1) {
76 return {redirectUrl: this.application.ninja.coreIoApi.rootUrl+'/calculator/components/calculator.reel/calculator.css'};
77 }
78*/
79 }
80 }
81 },
82
61 83
62 handleAppLoaded: { 84 handleAppLoaded: {
63 value: function() { 85 value: function() {
64 // 86 //
87
88 chrome.webRequest.onBeforeRequest.addListener(this.handleWebRequest.bind(this), {urls: ["<all_urls>"]}, ["blocking"]);
89
65 } 90 }
66 }, 91 },
67 92
diff --git a/js/document/html-document.js b/js/document/html-document.js
index 0c8695fb..16595d14 100755
--- a/js/document/html-document.js
+++ b/js/document/html-document.js
@@ -14,7 +14,7 @@ var Montage = require("montage/core/core").Montage,
14exports.HTMLDocument = Montage.create(TextDocument, { 14exports.HTMLDocument = Montage.create(TextDocument, {
15 15
16 _selectionExclude: { value: null, enumerable: false }, 16 _selectionExclude: { value: null, enumerable: false },
17 _htmlTemplateUrl: { value: "user-document-templates/montage-application-cloud/index.html", enumerable: false}, 17 _htmlTemplateUrl: { value: "js/document/templates/montage-html/index.html", enumerable: false},
18 _iframe: { value: null, enumerable: false }, 18 _iframe: { value: null, enumerable: false },
19 _server: { value: null, enumerable: false }, 19 _server: { value: null, enumerable: false },
20 _templateDocument: { value: null, enumerable: false }, 20 _templateDocument: { value: null, enumerable: false },
@@ -235,6 +235,7 @@ exports.HTMLDocument = Montage.create(TextDocument, {
235 // 235 //
236 initialize: { 236 initialize: {
237 value: function(file, uuid, iframe, callback) { 237 value: function(file, uuid, iframe, callback) {
238 //console.log('allow');
238 // 239 //
239 this._userDocument = file; 240 this._userDocument = file;
240 // 241 //
@@ -354,11 +355,15 @@ exports.HTMLDocument = Montage.create(TextDocument, {
354 }, 355 },
355 356
356 357
358
359
360
357 361
358 //////////////////////////////////////////////////////////////////// 362 ////////////////////////////////////////////////////////////////////
359 // 363 //
360 handleEvent: { 364 handleEvent: {
361 value: function(event){ 365 value: function(event){
366
362 //TODO: Clean up, using for prototyping save 367 //TODO: Clean up, using for prototyping save
363 this._templateDocument = {}; 368 this._templateDocument = {};
364 this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");; 369 this._templateDocument.head = this.iframe.contentWindow.document.getElementById("userHead");;
@@ -389,6 +394,8 @@ exports.HTMLDocument = Montage.create(TextDocument, {
389 this._stylesheets = this._document.styleSheets; // Entire stlyesheets array 394 this._stylesheets = this._document.styleSheets; // Entire stlyesheets array
390 395
391 this.callback(this); 396 this.callback(this);
397
398 //console.log('file content end');
392 } 399 }
393 }.bind(this), 50); 400 }.bind(this), 50);
394 401
@@ -440,7 +447,9 @@ exports.HTMLDocument = Montage.create(TextDocument, {
440 } 447 }
441 448
442 // Remving this callback and using the callback from the css load 449 // Remving this callback and using the callback from the css load
443 // this.callback(this); 450 //this.callback(this);
451
452
444 453
445 } 454 }
446 }, 455 },
diff --git a/js/document/templates/montage-html/default_html.css b/js/document/templates/montage-html/default_html.css
new file mode 100755
index 00000000..68300edf
--- /dev/null
+++ b/js/document/templates/montage-html/default_html.css
@@ -0,0 +1,75 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7* {
8 -webkit-transition-duration: 0s !important;
9 -webkit-animation-duration: 0s !important;
10 -webkit-animation-name: none !important;
11}
12
13html{
14 overflow:hidden;
15}
16
17body
18{
19 background: #808080;
20}
21
22#Viewport
23{
24 margin: 0px;
25 padding: 0px;
26 top: 200px;
27 left: 700px;
28 /*position: absolute;*/
29 /*height: 600px;*/
30 /*width: 800px;*/
31 opacity: 0.99;
32 z-index:2;
33}
34
35#stageBG
36{
37 background: #ffffff;
38 top: 200px;
39 left: 700px;
40 z-index:1;
41}
42
43.stageDimension
44{
45 position: absolute;
46 height: 600px;
47 width: 800px;
48}
49
50.stageView
51{
52 border: 1px solid black;
53 -webkit-transform-style: preserve-3d;
54 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
55}
56
57.stageContentShadow {
58 -webkit-box-shadow: 3px 5px 4px rgba(0,0,0,.5);
59 -moz-box-shadow: 3px 5px 4px rgba(0,0,0,.5);
60 box-shadow: 3px 5px 4px rgba(0,0,0,.5);
61}
62
63#userHead
64{
65 display: none;
66}
67
68.global3DSettings {
69 -webkit-transform-style: preserve-3d;
70 -webkit-transform: perspective(1400) matrix3d(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
71}
72
73.elem-red-outline {
74 outline: red solid thin;
75} \ No newline at end of file
diff --git a/js/document/templates/montage-html/index.html b/js/document/templates/montage-html/index.html
new file mode 100755
index 00000000..8b3d73bb
--- /dev/null
+++ b/js/document/templates/montage-html/index.html
@@ -0,0 +1,50 @@
1<!DOCTYPE html>
2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> -->
7
8<html>
9
10 <head>
11
12 <title>Ninja Prototype</title>
13
14 <link href="default_html.css" id="nj-stage-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
15 <link href="styles.css" id="nj-default-stylesheet" rel="stylesheet" type="text/css" media="screen"/>
16
17 <script type="text/javascript" data-package="." src="../../../../node_modules/montage/montage.js"></script>
18
19 <script type="text/javascript">
20 function getElement(x,y) {
21 return document.elementFromPoint(x,y);
22 }
23 </script>
24