diff options
-rwxr-xr-x | js/document/mediators/template.js | 98 | ||||
-rwxr-xr-x | js/document/models/base.js | 41 | ||||
-rwxr-xr-x | js/document/models/html.js | 2 | ||||
-rwxr-xr-x | js/document/views/design.js | 14 | ||||
-rw-r--r-- | js/mediators/io-mediator.js | 10 |
5 files changed, 123 insertions, 42 deletions
diff --git a/js/document/mediators/template.js b/js/document/mediators/template.js index 068a1f48..e04c16d9 100755 --- a/js/document/mediators/template.js +++ b/js/document/mediators/template.js | |||
@@ -8,7 +8,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
8 | // | 8 | // |
9 | var Montage = require("montage/core/core").Montage, | 9 | var Montage = require("montage/core/core").Montage, |
10 | Component = require("montage/ui/component").Component, | 10 | Component = require("montage/ui/component").Component, |
11 | TemplateCreator = require("node_modules/tools/template/template-creator").TemplateCreator; | 11 | TemplateCreator = require("node_modules/tools/template/template-creator").TemplateCreator, |
12 | ClassUuid = require("js/components/core/class-uuid").ClassUuid; | ||
12 | //////////////////////////////////////////////////////////////////////// | 13 | //////////////////////////////////////////////////////////////////////// |
13 | // | 14 | // |
14 | exports.TemplateDocumentMediator = Montage.create(Component, { | 15 | exports.TemplateDocumentMediator = Montage.create(Component, { |
@@ -83,9 +84,22 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
83 | parseHtmlToNinjaTemplate: { | 84 | parseHtmlToNinjaTemplate: { |
84 | value: function (html) { | 85 | value: function (html) { |
85 | //Creating temp object to mimic HTML | 86 | //Creating temp object to mimic HTML |
86 | var doc = window.document.implementation.createHTMLDocument(), template; | 87 | var doc = window.document.implementation.createHTMLDocument(), template, docHtmlTag, |
88 | hackHtml = document.createElement('html'), hackTag; | ||
87 | //Setting content to temp | 89 | //Setting content to temp |
88 | doc.getElementsByTagName('html')[0].innerHTML = html; | 90 | doc.getElementsByTagName('html')[0].innerHTML = html; |
91 | //TODO: Improve this, very bad way of copying attributes (in a pinch to get it working) | ||
92 | hackHtml.innerHTML = html.replace(/html/gi, 'ninjahtmlhack'); | ||
93 | hackTag = hackHtml.getElementsByTagName('ninjahtmlhack')[0]; | ||
94 | docHtmlTag = doc.getElementsByTagName('html')[0]; | ||
95 | //Looping through the attributes to copy them | ||
96 | for (var m in hackTag.attributes) { | ||
97 | if (hackTag.attributes[m].value) { | ||
98 | docHtmlTag.setAttribute(hackTag.attributes[m].name.replace(/ninjahtmlhack/gi, 'html'), hackTag.attributes[m].value.replace(/ninjahtmlhack/gi, 'html')); | ||
99 | } | ||
100 | } | ||
101 | //Garbage collection | ||
102 | hackHtml = hackTag = null; | ||
89 | //Creating return object | 103 | //Creating return object |
90 | return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc}; | 104 | return {head: doc.head.innerHTML, body: doc.body.innerHTML, document: doc}; |
91 | } | 105 | } |
@@ -93,7 +107,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
93 | //////////////////////////////////////////////////////////////////// | 107 | //////////////////////////////////////////////////////////////////// |
94 | //TODO: Expand to allow more templates, clean up variables | 108 | //TODO: Expand to allow more templates, clean up variables |
95 | parseNinjaTemplateToHtml: { | 109 | parseNinjaTemplateToHtml: { |
96 | value: function (template, ninjaWrapper, libCopyCallback) { | 110 | value: function (saveExternalData, template, ninjaWrapper, libCopyCallback) { |
97 | //TODO: Improve reference for rootUrl | 111 | //TODO: Improve reference for rootUrl |
98 | var regexRootUrl, | 112 | var regexRootUrl, |
99 | rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])), | 113 | rootUrl = this.application.ninja.coreIoApi.rootUrl + escape((this.application.ninja.documentController.documentHackReference.root.split(this.application.ninja.coreIoApi.cloudData.root)[1])), |
@@ -116,20 +130,36 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
116 | template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, ''); | 130 | template.file.content.document.head.innerHTML = template.head.innerHTML.replace(regexRootUrl, ''); |
117 | template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, ''); | 131 | template.file.content.document.body.innerHTML = template.body.innerHTML.replace(regexRootUrl, ''); |
118 | } | 132 | } |
133 | //Removes all attributes from node | ||
134 | function wipeAttributes (node) { | ||
135 | for (var f in node.attributes) { | ||
136 | node.removeAttribute(node.attributes[f].name); | ||
137 | } | ||
138 | } | ||
119 | //Copying attributes to maintain same properties as the <body> | 139 | //Copying attributes to maintain same properties as the <body> |
140 | wipeAttributes(template.file.content.document.body); | ||
120 | for (var n in template.body.attributes) { | 141 | for (var n in template.body.attributes) { |
121 | if (template.body.attributes[n].value) { | 142 | if (template.body.attributes[n].value) { |
122 | // | ||
123 | template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value); | 143 | template.file.content.document.body.setAttribute(template.body.attributes[n].name, template.body.attributes[n].value); |
124 | } | 144 | } |
125 | } | 145 | } |
126 | 146 | wipeAttributes(template.file.content.document.head); | |
127 | 147 | //Copying attributes to maintain same properties as the <head> | |
128 | 148 | for (var m in template.document.head.attributes) { | |
129 | //TODO: Add attribute copying for <HEAD> and <HTML> | 149 | if (template.document.head.attributes[m].value) { |
130 | 150 | template.file.content.document.head.setAttribute(template.document.head.attributes[m].name, template.document.head.attributes[m].value); | |
131 | 151 | } | |
132 | 152 | } | |
153 | //Copying attributes to maintain same properties as the <html> | ||
154 | var htmlTagMem = template.document.getElementsByTagName('html')[0], htmlTagDoc = template.file.content.document.getElementsByTagName('html')[0]; | ||
155 | wipeAttributes(htmlTagDoc); | ||
156 | for (var m in htmlTagMem.attributes) { | ||
157 | if (htmlTagMem.attributes[m].value) { | ||
158 | if (htmlTagMem.attributes[m].value.replace(/montage-app-bootstrapping/gi, '').length>0) { | ||
159 | htmlTagDoc.setAttribute(htmlTagMem.attributes[m].name, htmlTagMem.attributes[m].value.replace(/ montage-app-bootstrapping/gi, '')); | ||
160 | } | ||
161 | } | ||
162 | } | ||
133 | //Getting list of current nodes (Ninja DOM) | 163 | //Getting list of current nodes (Ninja DOM) |
134 | presentNodes = template.file.content.document.getElementsByTagName('*'); | 164 | presentNodes = template.file.content.document.getElementsByTagName('*'); |
135 | //Looping through nodes to determine origin and removing if not inserted by Ninja | 165 | //Looping through nodes to determine origin and removing if not inserted by Ninja |
@@ -328,7 +358,7 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
328 | 358 | ||
329 | 359 | ||
330 | 360 | ||
331 | //TODO: Make proper webGL/Canvas method | 361 | |
332 | 362 | ||
333 | // | 363 | // |
334 | var webgltag, webgllibtag, webglrdgetag, mjstag, mjslibtag, matchingtags = [], | 364 | var webgltag, webgllibtag, webglrdgetag, mjstag, mjslibtag, matchingtags = [], |
@@ -357,19 +387,33 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
357 | } | 387 | } |
358 | } | 388 | } |
359 | } | 389 | } |
390 | |||
391 | |||
392 | |||
393 | |||
394 | //TODO: Make proper webGL/Canvas method | ||
395 | |||
396 | |||
360 | //Checking for webGL elements in document | 397 | //Checking for webGL elements in document |
361 | if (template.webgl && template.webgl.length > 1) {//TODO: Should be length 0, hack for a temp fix | 398 | if (template.webgl && template.webgl.length > 1) {//TODO: Should be length 0, hack for a temp fix |
362 | var rdgeDirName, rdgeVersion, cvsDataDir = this.getCanvasDirectory(template.file.root), fileCvsDir, fileCvsDirAppend, cvsDirCounter = 1, fileOrgDataSrc; | 399 | var rdgeDirName, rdgeVersion, cvsDataDir = this.getCanvasDirectory(template.file.root), fileCvsDir, fileCvsDirAppend, cvsDirCounter = 1, fileOrgDataSrc; |
363 | // | 400 | // |
364 | if (cvsDataDir && !matchingtags.length && !webgllibtag) { | 401 | if (cvsDataDir && !matchingtags.length && !webgllibtag) { |
365 | fileCvsDir = cvsDataDir+template.file.name.split('.'+template.file.extension)[0]; | 402 | |
403 | if (template.libs.canvasId) { | ||
404 | libsobserver.canvasId = template.libs.canvasId; | ||
405 | } else { | ||
406 | libsobserver.canvasId = ClassUuid.generate(); | ||
407 | } | ||
408 | |||
409 | //Creating data directory, will include materials at a later time | ||
410 | fileCvsDir = cvsDataDir+template.file.name.split('.'+template.file.extension)[0]+'_'+libsobserver.canvasId; | ||
411 | |||
366 | if (!this._getUserDirectory(fileCvsDir)) { | 412 | if (!this._getUserDirectory(fileCvsDir)) { |
367 | fileCvsDirAppend = fileCvsDir+cvsDirCounter; | 413 | //TODO: create proper logic not to overwrite files |
368 | while (!this._getUserDirectory(fileCvsDirAppend)) { | 414 | console.log('error'); |
369 | fileCvsDirAppend = fileCvsDir+(cvsDirCounter++); | ||
370 | } | ||
371 | } | 415 | } |
372 | //TODO: Allow user overwrite | 416 | |
373 | fileCvsDir += '/'; | 417 | fileCvsDir += '/'; |
374 | } else if (webgllibtag && webgllibtag.getAttribute && webgllibtag.getAttribute('data-ninja-canvas-json') !== null) { | 418 | } else if (webgllibtag && webgllibtag.getAttribute && webgllibtag.getAttribute('data-ninja-canvas-json') !== null) { |
375 | fileOrgDataSrc = template.file.root+webgllibtag.getAttribute('data-ninja-canvas-json'); | 419 | fileOrgDataSrc = template.file.root+webgllibtag.getAttribute('data-ninja-canvas-json'); |
@@ -437,17 +481,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
437 | //Looping through data to create escaped array | 481 | //Looping through data to create escaped array |
438 | for (var j = 0; template.webgl[j]; j++) { | 482 | for (var j = 0; template.webgl[j]; j++) { |
439 | if (j === 0) { | 483 | if (j === 0) { |
440 | //if (fileCvsDir) { | 484 | json += '\n\t\t\t"' + escape(template.webgl[j]) + '"'; |
441 | // json += '\n\t\t\t"' + template.webgl[j] + '"'; | ||
442 | //} else { | ||
443 | json += '\n\t\t\t"' + escape(template.webgl[j]) + '"'; | ||
444 | //} | ||
445 | } else { | 485 | } else { |
446 | //if (fileCvsDir) { | 486 | json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"'; |
447 | // json += ',\n\t\t\t"' + template.webgl[j] + '"'; | ||
448 | //} else { | ||
449 | json += ',\n\t\t\t"' + escape(template.webgl[j]) + '"'; | ||
450 | //} | ||
451 | } | 487 | } |
452 | } | 488 | } |
453 | //Closing array (make-shift JSON string to validate data in <script> tag) | 489 | //Closing array (make-shift JSON string to validate data in <script> tag) |
@@ -575,6 +611,8 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
575 | } else { | 611 | } else { |
576 | cleanHTML = template.file.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this)); | 612 | cleanHTML = template.file.content.document.documentElement.outerHTML.replace(/(\b(?:(?:https?|ftp|file|[A-Za-z]+):\/\/|www\.|ftp\.)(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[-A-Z0-9+&@#\/%=~_|$?!:,.])*(?:\([-A-Z0-9+&@#\/%=~_|$?!:,.]*\)|[A-Z0-9+&@#\/%=~_|$]))/gi, parseNinjaRootUrl.bind(this)); |
577 | } | 613 | } |
614 | //TODO: Remove, this is a temp hack | ||
615 | cleanHTML = '<!DOCTYPE html>\n'+cleanHTML; | ||
578 | // | 616 | // |
579 | function parseNinjaRootUrl(url) { | 617 | function parseNinjaRootUrl(url) { |
580 | if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) { | 618 | if (url.indexOf(this.application.ninja.coreIoApi.rootUrl) !== -1) { |
@@ -590,9 +628,9 @@ exports.TemplateDocumentMediator = Montage.create(Component, { | |||
590 | } | 628 | } |
591 | // | 629 | // |
592 | if (libsobserver.montage || libsobserver.canvas) { | 630 | if (libsobserver.montage || libsobserver.canvas) { |
593 | return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: true}; | 631 | return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: true, montageId: libsobserver.montageId, canvasId: libsobserver.canvasId}; |
594 | } else { | 632 | } else { |
595 | return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: false}; | 633 | return {content: this.getPrettyHtml(cleanHTML.replace(this.getAppTemplatesUrlRegEx(), '')), libs: false, montageId: libsobserver.montageId, canvasId: libsobserver.canvasId}; |
596 | } | 634 | } |
597 | } | 635 | } |
598 | }, | 636 | }, |
diff --git a/js/document/models/base.js b/js/document/models/base.js index a3644815..5fa06259 100755 --- a/js/document/models/base.js +++ b/js/document/models/base.js | |||