From fda7b595c96d99177fdd93de8da9030348a3f8fb Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 18 Mar 2012 12:34:29 -0700
Subject: Temp I/O functionality for M-JS components
Added the ability to save montages component serialization from Ninja. Very rough, but functional.
---
js/mediators/io-mediator.js | 70 +++++++++++++++++++++++++++++++++++++++++----
1 file changed, 65 insertions(+), 5 deletions(-)
(limited to 'js/mediators/io-mediator.js')
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index d81f4543..01879bac 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -6,10 +6,11 @@ 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,
- FileIo = require("js/io/system/fileio").FileIo,
- ProjectIo = require("js/io/system/projectio").ProjectIo;
+var Montage = require("montage/core/core").Montage,
+ Component = require("montage/ui/component").Component,
+ FileIo = require("js/io/system/fileio").FileIo,
+ ProjectIo = require("js/io/system/projectio").ProjectIo,
+ TemplateCreator = require("node_modules/tools/template-creator").TemplateCreator;
////////////////////////////////////////////////////////////////////////
//
exports.IoMediator = Montage.create(Component, {
@@ -369,7 +370,7 @@ exports.IoMediator = Montage.create(Component, {
}
}
//
- var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'), webgljstag, webgllibtag, webglrdgetag;
+ var json, matchingtags = [], webgltag, scripts = template.document.content.document.getElementsByTagName('script'), webgljstag, webgllibtag, webglrdgetag, mjstag, mjslibtag;
//
for (var i in scripts) {
if (scripts[i].getAttribute) {
@@ -385,6 +386,12 @@ exports.IoMediator = Montage.create(Component, {
if (scripts[i].getAttribute('data-ninja-webgl-rdge') !== null) {
webglrdgetag = scripts[i]; // TODO: Add logic to delete unneccesary tags
}
+ if (scripts[i].getAttribute('type') !== 'text/montage-serialization') {
+ mjstag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+ }
+ if (scripts[i].getAttribute('data-mjs-lib') !== null) {
+ mjslibtag = scripts[i]; // TODO: Add logic to delete unneccesary tags
+ }
}
}
//
@@ -451,6 +458,59 @@ function loadWebGL (e) {\n\
//Setting string in tag
webgltag.innerHTML = json;
}
+
+
+
+
+ //
+ var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create();
+ for (var m in template.mjs) {
+ mjsComponents.push(template.mjs[m]);
+ mjsCounter++;
+ }
+
+// console.log(mjsComponents);
+
+ //console.log(TemplateCreator.)
+
+ if (template.mjs && mjsCounter > 0) {
+ var mjsDirName, mjsVersion,
+ mjscode = temp.initWithHeadAndBodyElements(template.document.content.document.documentElement.head, template.document.content.document.documentElement.body, mjsComponents)._ownerSerialization;
+ //Copy Montage library if needed
+ for (var i in this.application.ninja.coreIoApi.ninjaLibrary.libs) {
+ //Checking for Montage library to be available
+ if (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name === 'Montage') {
+ mjsDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
+ mjsVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
+ this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, mjsDirName);
+ //TODO: Fix to allow no overwrite
+ var packjson = this.application.ninja.coreIoApi.createFile({uri: template.document.root+'package.json', contents: '{"mappings": {"montage": "'+mjsDirName+'/"}}'});
+ } else {
+ //TODO: Error handle no available library to copy
+ }
+ }
+ //
+ if (!mjslibtag) {
+ mjslibtag = template.document.content.document.createElement('script');
+ mjslibtag.setAttribute('type', 'text/javascript');
+ mjslibtag.setAttribute('src', mjsDirName+'/montage.js');
+ mjslibtag.setAttribute('data-mjs-lib', 'true');
+ template.document.content.document.head.appendChild(mjslibtag);
+ }
+ //
+ if (!mjstag) {
+ mjstag = template.document.content.document.createElement('script');
+ mjstag.setAttribute('type', 'text/montage-serialization');
+ template.document.content.document.head.appendChild(mjstag);
+ }
+ //
+ mjstag.innerHTML = mjscode;
+ }
+
+
+
+
+
//Cleaning URLs from HTML
var cleanHTML = template.document.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));
//
--
cgit v1.2.3
From 9cb68d376870eea3db3636c30e5fa09d9f71c8cf Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Sun, 18 Mar 2012 18:07:40 -0700
Subject: Tests and clean-up
---
js/mediators/io-mediator.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
(limited to 'js/mediators/io-mediator.js')
diff --git a/js/mediators/io-mediator.js b/js/mediators/io-mediator.js
index 01879bac..18a517a5 100644
--- a/js/mediators/io-mediator.js
+++ b/js/mediators/io-mediator.js
@@ -462,17 +462,17 @@ function loadWebGL (e) {\n\
+
+
+
//
var mjsCounter = 0, mjsComponents = [], temp = TemplateCreator.create();
+ //
for (var m in template.mjs) {
mjsComponents.push(template.mjs[m]);
mjsCounter++;
}
-
-// console.log(mjsComponents);
-
- //console.log(TemplateCreator.)
-
+ //
if (template.mjs && mjsCounter > 0) {
var mjsDirName, mjsVersion,
mjscode = temp.initWithHeadAndBodyElements(template.document.content.document.documentElement.head, template.document.content.document.documentElement.body, mjsComponents)._ownerSerialization;
@@ -483,7 +483,7 @@ function loadWebGL (e) {\n\
mjsDirName = (this.application.ninja.coreIoApi.ninjaLibrary.libs[i].name+this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version).toLowerCase();
mjsVersion = this.application.ninja.coreIoApi.ninjaLibrary.libs[i].version;
this.application.ninja.coreIoApi.ninjaLibrary.copyLibToCloud(template.document.root, mjsDirName);
- //TODO: Fix to allow no overwrite
+ //TODO: Fix to allow no overwrite and nested locations
var packjson = this.application.ninja.coreIoApi.createFile({uri: template.document.root+'package.json', contents: '{"mappings": {"montage": "'+mjsDirName+'/"}}'});
} else {
//TODO: Error handle no available library to copy
@@ -511,6 +511,8 @@ function loadWebGL (e) {\n\
+
+
//Cleaning URLs from HTML
var cleanHTML = template.document.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));
//
--
cgit v1.2.3