} [listenerList] OPTIONAL a list of listeners that should be registered
* @return {Object} Object containing the instance of the class {{#crossLink "MediaManager"}}{{/crossLink}}
* @public
*/
- create: function(successCallback, failureCallback){
+ create: function(successCallback, failureCallback, listenerList){
if (instance === null) {
jQuery.extend(true,this,constructor());
instance = this;
+
+ if(listenerList){
+ for(var i=0, size = listenerList.length; i < size; ++i){
+ instance.addListener(listenerList[i].name, listenerList[i].listener);
+ }
+ }
+
var pluginArray = getPluginsToLoad();
loadAllPlugins(pluginArray,successCallback, failureCallback);
}
+ else if(listenerList){
+ for(var i=0, size = listenerList.length; i < size; ++i){
+ instance.addListener(listenerList[i].name, listenerList[i].listener);
+ }
+ }
return this;
},
getInstance: function(){
diff --git a/assets/www/mmirf/manager/presentationManager.js b/assets/www/mmirf/manager/presentationManager.js
index d89c52a..2cd2f6e 100644
--- a/assets/www/mmirf/manager/presentationManager.js
+++ b/assets/www/mmirf/manager/presentationManager.js
@@ -42,8 +42,6 @@
var mobileDS = window.mobileDS ||
{};
-var pageIndex = 0;
-
/**
* A class to manage the displayed content by using views and partials. layouts array.
*
@@ -274,21 +341,42 @@ mobileDS.PresentationManager = (function(){
var ctrlNames = mobileDS.ControllerManager.getInstance().getControllerNames();
for(var i=0, size = ctrlNames.length; i < size; ++i){
var ctrl = mobileDS.ControllerManager.getInstance().getController( ctrlNames[i] );
- var layoutDef = ctrl.getLayout();
- if(layoutDef){
+ var layoutInfo = ctrl.getLayout();
+
+
+ if(layoutInfo){
+
+ var genPath = mobileDS.constants.getInstance().getCompiledLayoutPath()//TODO add compiled-path to view-info object (and read it from file-structure/JSON)
+ + layoutInfo.fileName + '.js';
+
$.ajax({
async: false,
dataType: "text",
- url: mobileDS.constants.getInstance(forBrowser).getLayoutPath() + layoutDef["fileName"] + '.ehtml',
+ url: mobileDS.constants.getInstance(forBrowser).getLayoutPath() + layoutInfo.fileName + '.ehtml',
success: function(data){
- var layout = new Layout(ctrl.getName(), data);
- layouts.put(layout.getName(), layout);//[layoutIndex++] = layout;
+
+ if(isUsePreCompiledViews){
+
+ loadPrecompiledView(data, genPath, function(err){
+ console.error('Could not load precompiled layout from "'+genPath+'", because: '+err);
+
+ var layout = new Layout(ctrl.getName(), data);
+ layouts.put(layout.getName(), layout);
+ });
+
+ }
+ else {
+ var layout = new Layout(ctrl.getName(), data);
+ layouts.put(layout.getName(), layout);
+ }
}
});
+
+// });//FIXME TEST
+
}
}
}
-
/**
* This function actually loads the views for every controller, creates an instance of a view class and puts the view instance in the views array.{transition: STRING, reverse: BOOLEAN}
+ * wheretransition: the name for the transition (see jQuery Mobile Doc for possible values)
+ * DEFAULT: "none".
+ * reverse: whether the animation should in "forward" (FALSE) direction, or "backwards" (TRUE)
+ * DEFAULT: FALSE
+ * @public
+ */
renderView: function(ctrlName, viewName, data){
var ctrl = mobileDS.ControllerManager.getInstance().getController(ctrlName);
@@ -653,22 +736,33 @@ mobileDS.PresentationManager = (function(){
/**
- * Actually renders the View.$("div[data-role='page']").first().remove() ' to
- * remove the old page content: it's not robust.on_page_load action is performed.
- *
- * @function doRenderView
- * @param {String} ctrlName Name of the controller
- * @param {String} viewName Name of the view to render
- * @param {Object} view View object that is to be rendered
- * @param {Object} ctrl Controller object of the view to render
- * @param {Object} [data] optional data for the view
- * @public
- */
+ * Actually renders the View.$("div[data-role='page']").first().remove() ' to
+ * remove the old page content: it's not robust.on_page_load action is performed.
+ *
+ * @function doRenderView
+ * @param {String} ctrlName Name of the controller
+ * @param {String} viewName Name of the view to render
+ * @param {Object} view View object that is to be rendered
+ * @param {Object} ctrl Controller object of the view to render
+ * @param {Object}
+ * [data] optional data for the view.
+ * Currently same jQuery Mobile specific properties are supported: {transition: STRING, reverse: BOOLEAN}
+ * wheretransition: the name for the transition (see jQuery Mobile Doc for possible values)
+ * DEFAULT: "none".
+ * reverse: whether the animation should in "forward" (FALSE) direction, or "backwards" (TRUE)
+ * DEFAULT: FALSE
+ * @public
+ */
doRenderView: function(ctrlName, viewName, view, ctrl, data){
var layout = instance.getLayout(ctrlName, true);
@@ -693,8 +787,8 @@ mobileDS.PresentationManager = (function(){
//TODO do localization rendering for layout (i.e. none-body- or dialogs-content)
var pg = new RegExp("pageContainer", "ig");
- var oldId = "#pageContainer" + pageIndex;
-
+ var oldId = "#pageContainer" + pageIndex;//TODO make "pageContainer" a CONSTANT
+
// get old content from page
var oldContent = $(oldId);
if(oldContent.length < 1 && oldId == '#pageContainer0'){
@@ -718,6 +812,9 @@ mobileDS.PresentationManager = (function(){
}
var newPage = $(layoutBody);
+ ctrl.performIfPresent('before_page_load', data);//MODIFICATION for lever: added before_page_load hook!
+// ctrl.performIfPresent('before_page_load_'+viewName, data);
+
//'load' new content into the page (using jQuery mobile)
newPage.appendTo($.mobile.pageContainer);
diff --git a/assets/www/mmirf/manager/settings/configurationManager.js b/assets/www/mmirf/manager/settings/configurationManager.js
index 600e311..0b98d86 100644
--- a/assets/www/mmirf/manager/settings/configurationManager.js
+++ b/assets/www/mmirf/manager/settings/configurationManager.js
@@ -82,11 +82,14 @@ mobileDS.ConfigurationManager = (function(){
if(data){
var jsonData = data;//jQuery.parseJSON( data );
- //get & set language setting
- if(jsonData.language && jsonData.language != mobileDS.LanguageManager.getInstance().getLanguage()){
- mobileDS.LanguageManager.getInstance().setLanguage(jsonData.language);
- if(IS_DEBUG_ENABLED) console.debug("ConfigurationManager.constructor: setting language to "+ jsonData.language);//debug
- }
+ //DISABLED: avoid cyclic dependency LanguageManager <-> ConfigurationManager
+ // & avoid "private" knowledge about LanguageManager
+ // -> now LanguageManager "pulls" language configuration from ConfigurationManager
+// //get & set language setting
+// if(jsonData.language && jsonData.language != mobileDS.LanguageManager.getInstance().getLanguage()){
+// mobileDS.LanguageManager.getInstance().setLanguage(jsonData.language);
+// if(IS_DEBUG_ENABLED) console.debug("ConfigurationManager.constructor: setting language to "+ jsonData.language);//debug
+// }
configData = jsonData;
}
@@ -103,7 +106,11 @@ mobileDS.ConfigurationManager = (function(){
*
* This does not return the language of the configuration, but is a
* shortcut for {@link mobileDS.LanguageManager#getLanguage}.
- *
+ *
+ *
+ * @deprecated use mobileDS.LanguageManager.getInstance().getLanguage() instead!
+ *
+ *
* @function getLanguage
* @returns {String} The currently used language
* @public
@@ -116,6 +123,9 @@ mobileDS.ConfigurationManager = (function(){
*
*
This does not set the language of the configuration, but is a
* shortcut for {@link mobileDS.LanguageManager#setLanguage}.
+ *
+ *
+ * @deprecated use mobileDS.LanguageManager.getInstance().setLanguage(lang) instead!
*
* @function setLanguage
* @param {String} lang The language which is to be used
diff --git a/assets/www/mmirf/mvc/controllers/controller.js b/assets/www/mmirf/mvc/controllers/controller.js
index e9ed35a..2cb2e00 100644
--- a/assets/www/mmirf/mvc/controllers/controller.js
+++ b/assets/www/mmirf/mvc/controllers/controller.js
@@ -150,7 +150,7 @@ Controller.prototype.loadHelper = function(name, helperPath){
console.warn('Could not determine contents for directory "'+path+'"');
return; ////////////////////// EARLY EXIT //////////////////////////////
}
- else if(! $.isArray(dirContents) || dirContents.length < 1){
+ else if(! mobileDS.CommonUtils.getInstance().isArray(dirContents) || dirContents.length < 1){
console.warn('Invalid information for contents of directory "'+path+'": '+dirContents);
return; ////////////////////// EARLY EXIT //////////////////////////////
}
@@ -269,14 +269,10 @@ Controller.prototype.getHelper = function(){
* @public
*/
Controller.prototype.parseViews = function(viewDefs){
- var self = this;
- var i = 0;
- $.each(viewDefs, function(index, view){
- var viewName = view['name'];
- self.views[i] = viewName;
- i++;
- });
+ for(var i=0, size = viewDefs.length; i < size; ++i){
+ this.views.push(viewDefs[i].name);
+ }
};
@@ -290,14 +286,10 @@ Controller.prototype.parseViews = function(viewDefs){
* @public
*/
Controller.prototype.parsePartials = function(partialDefs){
- var self = this;
- var i = 0;
- $.each(partialDefs, function(index, partial){
- var partialName = partial['name'];
- self.partials[i] = partialName;
- i++;
- });
+ for(var i=0, size = partialDefs.length; i < size; ++i){
+ this.partials.push(partialDefs[i].name);
+ }
};
diff --git a/assets/www/mmirf/mvc/parser/parseElementTypes.js b/assets/www/mmirf/mvc/parser/parseElementTypes.js
index 9388ace..71e42fc 100644
--- a/assets/www/mmirf/mvc/parser/parseElementTypes.js
+++ b/assets/www/mmirf/mvc/parser/parseElementTypes.js
@@ -24,46 +24,398 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+var mobileDS = window.mobileDS || {};
+mobileDS.parser = mobileDS.parser || {};
/**
- * @module mobileDS.tools
*
+ *
+ * @category parser
+ * @namespace This module contains constant Definitions for the Template Parser and Renderer.
+ * @public
*/
-var mobileDS = window.mobileDS || {};
-mobileDS.parser = mobileDS.parser || {};
mobileDS.parser.element = mobileDS.parser.element || {};
//TODO detect&use Object.defineProperty (if positively detected), e.g.:
// Object.defineProperty(mobileDS.parser.element, 'INCLUDE_SCRIPT', {value : 0, writable : false, configurable : false, enumerable : true});
-/*
+/**
+ * Constant for template expression type include script .
*
- * @category parser
+ *
+ * The template expression generates a script TAG.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type INCLUDE_SCRIPT:
+ *
+ * scriptPath : the path / URL to the resourcescriptPathType : the type of the scriptPath
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * @type {Number}
* @public
*/
mobileDS.parser.element.INCLUDE_SCRIPT = 0;
+/**
+ * Constant for template expression type include style .
+ *
+ *
+ * The template expression generates a style reference, i.e.
+ * a link TAG with rel attribute stylesheet.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type INCLUDE_STYLE:
+ *
+ * stylePath : stylePathType : the type of the stylePath
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.INCLUDE_STYLE = 2;
+/**
+ * Constant for template expression type localize .
+ *
+ *
+ * The template expression inserts a localized String.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type LOCALIZE:
+ *
+ * name : the name/identifier for the localized StringnameType : the type of the name
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.LOCALIZE = 4;
+/**
+ * Constant for template expression type yield declaration .
+ *
+ *
+ * The template expression declares a yield section.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type YIELD_DECLARATION:
+ *
+ * name : the name/identifier for the yield sectionnameType : the type of the name
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.YIELD_DECLARATION = 8;
+/**
+ * Constant for template expression type yield content .
+ *
+ *
+ * The template expression specifies the content of a yield section.
+ *
+ *
+ * A yield section corresponds to a {@link ContentElement}:
+ * Its content can itself contain HTML content as well as template expressions.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.YIELD_CONTENT = 16;
+/**
+ * Constant for template expression type code block .
+ *
+ *
+ * The template expression represents a compiled code block (script).
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type BLOCK:
+ *
+ * scriptContent {String}: OPTIONALLY the script code as a StringscriptEval {Function}: the compiled script code in form of a function. The
+ * function takes one argument: the current data-object.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.BLOCK = 32;
+/**
+ * Constant for template expression type code statement .
+ *
+ *
+ * The template expression represents a compiled code statement (script).
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type STATEMENT:
+ *
+ * scriptContent {String}: OPTIONALLY the script code as a StringscriptEval {Function}: the compiled script code in form of a function. The
+ * function takes one argument: the current data-object.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.STATEMENT = 64;
+/**
+ * Constant for template expression type helper .
+ *
+ *
+ * The template expression will invoke a function in the {@link Helper} instance
+ * (depending of the {@link Controller}, in which's view definition this template expression is used).
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type HELPER:
+ *
+ * helper : the name of the helper functionhelperType : the type of the helper
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStartargsEval {Function}: OPTIONALLY compiled getter Function for retrieving the current ARGS
+ * (optional argument) of the helper expression. The function takes one argument: the current data-object.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.HELPER = 128;
+/**
+ * Constant for template expression type if .
+ *
+ *
+ * The template expression represents an if-expression, including the content-block
+ * that follows the condition-statement of the if-expression.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type IF:
+ *
+ * ifEval {Function}: the condition statement, that was compiled into a Function. The
+ * function takes one argument: the current data-object.content {ContentElement}: the HTML / template content that should be render, in case the
+ * if-expression evaluates to true.elseContent {@link mobileDS.parser.ParsingResult}: OPTIONALLY a ParsingResult
+ * representing an else-expression, see {@link mobileDS.parser.element.ELSE}.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.IF = 256;
+/**
+ * Constant for template expression type else .
+ *
+ *
+ * The template expression represents an else-expression (including its content-block);
+ * an else-expression may occur in combination with an if-expression, see {@link mobileDS.parser.element.IF}.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type ELSE:
+ *
+ * content {ContentElement}: the HTML / template content that should be render, in case the
+ * if-expression (to which the else-expression belongs) evaluates to false.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.ELSE = 512;
+/**
+ * Constant for template expression type for .
+ *
+ *
+ * The template expression represents for-expression (including its content-block);
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type FOR:
+ *
+ * forControlType {String}: the type of for-loop, either FORITER or FORSTEPforInitEval {Function}: the initialization statement of the for-expression, compiled into
+ * a Function. The function takes one argument: the current data-object.FORITER: @for(PROP in OBJ){ ... }@
+ *
+ * forIterator {Object}: an iterator object with functions hasNext() : Boolean and
+ * next() : String (which returns the name of the property currently iterated).forPropName {String}: the variable name for the property which is currently iterated over.
+ * FORSTEP: @for(INIT; CONDITION; INCREMENT){ ... }@
+ *
+ * forConditionEval {Function}: the condition statement of the for-expression, compiled into
+ * a Function. The function takes one argument: the current data-object.forIncrementEval {Function}: the increment statement of the for-expression, compiled into
+ * a Function. The function takes one argument: the current data-object.
+ * content {ContentElement}: the HTML / template content that should be rendered
+ * during each iteration of the for-loop.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.FOR = 1024;
+/**
+ * Constant for template expression type render .
+ *
+ *
+ * The template expression renders a partial view into a view.
+ *
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type RENDER:
+ *
+ * partial : the name of the partial viewpartialType : the type of the partial
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStartcontroller : the name of the controller, to which the partial view definition belongscontrollerType : the type of the controller
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStartargsEval {Function}: OPTIONALLY compiled getter Function for retrieving the current ARGS
+ * (optional argument) of the render expression. The function takes one argument: the current data-object.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.RENDER = 2048;
+/**
+ * Constant for template expression type escape enter .
+ *
+ *
+ * The template expression represents an escape statement (when entering a template expression);
+ * escaping means, that the following sequence is not interpreted as template expression.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type ESCAPE_ENTER:
+ *
+ * text {String}: the text that will be rendered (i.e. without the escape-character(s) itself).
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.ESCAPE_ENTER = 4096;
+/**
+ * Constant for template expression type escape exit .
+ *
+ *
+ * The template expression represents an escape statement (when exiting a template expression);
+ * escaping means, that the following sequence is not interpreted as template expression.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type ESCAPE_EXIT:
+ *
+ * text {String}: the text that will be rendered (i.e. without the escape-character(s) itself).
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.ESCAPE_EXIT = 8192;
+/**
+ * Constant for for-expression type iter ("iteration").
+ *
+ *
+ * This type identifies an ITERATION type for-expression.
+ *
+ *
+ * @type {Number}
+ * @public
+ * @see mobileDS.parser.element.FOR
+ */
mobileDS.parser.element.FOR_TYPE_ITER = 16384;
+/**
+ * Constant for for-expression type step ("step-wise").
+ *
+ *
+ * This type identifies an STEP-wise type for-expression.
+ *
+ *
+ * @type {Number}
+ * @public
+ * @see mobileDS.parser.element.FOR
+ */
mobileDS.parser.element.FOR_TYPE_STEP = 32768;
+/**
+ * Constant for template expression type variable declaration .
+ *
+ *
+ * The template expression represents a variable declaration.
+ *
+ *
+ * Properties of {@link mobileDS.parser.ParsingResult} objects with type VAR_DECLARATION:
+ *
+ * name : the name for the variable (without the leading @ of template variables)nameType : the type of the name field: StringLiteral
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.VAR_DECLARATION = 65536;
+/**
+ * Constant for template expression type variable reference .
+ *
+ *
+ * This template expression is used within JavaScript code blocks / statements,
+ * in order to replace the occurrence of the template variable by an
+ * appropriate getter function, that retrieves the current value of the variable
+ * during the execution of the script code.
+ *
+ *
+ * NOTE: this is used during compilation of the Function objects, used e.g. by BLOCK, STATEMENT, FOR etc.
+ *
+ *
+ * NOTE: the name of the variable is extracted from the raw-template text during processing/compilation
+ * of the Functions.
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.VAR_REFERENCE = 131072;
+/**
+ * Constant for template expression type comment .
+ *
+ *
+ * The template expression represents a template-comment: the content of the comment will be ignored
+ * (that is: removed during processing of the template).
+ *
+ * @type {Number}
+ * @public
+ */
mobileDS.parser.element.COMMENT = 262144;
+/**
+ * Constant for data name that is used to hold the current data :
+ * this name will be used for the argument name of generated/compiled Functions, and in the Function code block
+ * appropriate getter/setter expression will be inserted.
+ *
+ * @type {String}
+ * @public
+ */
mobileDS.parser.element.DATA_NAME = '__$$DATA$$__';
+/**
+ * Constant for the name of the reserved data variable: the optional data argument is passed in
+ * into rendering-calls for views, layouts etc. (see PresentationManager)
+ *
+ * @type {String}
+ * @public
+ */
mobileDS.parser.element.DATA_ARGUMENT_NAME = '@data';
+/**
+ * Constant for the name of the reserved argument variable: some template expressions
+ * have an (optional) argument argument, which can be accessed using the variable name
+ * within the template expressions inner content-/code-blocks.
+ *
+ * @type {String}
+ * @public
+ */
mobileDS.parser.element.ARGUMENT_ARGUMENT_NAME = '@argument';
diff --git a/assets/www/mmirf/mvc/parser/parsingResult.js b/assets/www/mmirf/mvc/parser/parsingResult.js
index 2167df6..dbb1c4a 100644
--- a/assets/www/mmirf/mvc/parser/parsingResult.js
+++ b/assets/www/mmirf/mvc/parser/parsingResult.js
@@ -40,16 +40,142 @@ mobileDS.parser = mobileDS.parser || {};
/**
* ParsingResult represents an element that was detected during parsing.
*
+ *
* The detected element is referenced by the properties start and end
* that refer to the start-index and end-index within the parsed text.
*
+ *
* The ParsingResult has a type property which refers to the kind of element
- * that was detected (see constants in mobileDS.parser.element).
+ * that was detected (see constants in {@link mobileDS.parser.element}).
*
- * In addition the ParsingResult may have several properties that depend of its type. In general,
+ *
+ * In addition, the ParsingResult may have several properties that depend of its type. In general,
* these properties refer to detected parts of the element (e.g. for a invocation-statement, these
* may refer to its arguments).
*
+ *
+ *
+ * Properties for INCLUDE_SCRIPT type:
+ *
+ * scriptPath : the path / URL to the resourcescriptPathType : the type of the scriptPath
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * Properties for INCLUDE_STYLE type:
+ *
+ * stylePath : stylePathType : the type of the stylePath
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * Properties for LOCALIZE type:
+ *
+ * name : the name/identifier for the localized StringnameType : the type of the name
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ *
+ * Properties for YIELD_DECLARATION type:
+ *
+ * name : the name/identifier for the yield sectionnameType : the type of the name
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStart
+ * Properties for BLOCK type:
+ *
+ * scriptContent {String}: OPTIONALLY the script code as a StringscriptEval {Function}: the compiled script code in form of a function. The
+ * function takes one argument: the current data-object.
+ *
+ * Properties for STATEMENT type:
+ *
+ * scriptContent {String}: OPTIONALLY the script code as a StringscriptEval {Function}: the compiled script code in form of a function. The
+ * function takes one argument: the current data-object.
+ *
+ * Properties for HELPER type:
+ *
+ * helper : the name of the helper functionhelperType : the type of the helper
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStartargsEval {Function}: OPTIONALLY compiled getter Function for retrieving the current ARGS
+ * (optional argument) of the helper expression. The function takes one argument: the current data-object.
+ *
+ * Properties for IF type:
+ *
+ * ifEval {Function}: the condition statement, that was compiled into a Function. The
+ * function takes one argument: the current data-object.content {ContentElement}: the HTML / template content that should be render, in case the
+ * if-expression evaluates to true.elseContent {@link mobileDS.parser.ParsingResult}: OPTIONALLY a ParsingResult
+ * representing an else-expression, see {@link mobileDS.parser.element.ELSE}.
+ *
+ * Properties for ELSE type:
+ *
+ * content {ContentElement}: the HTML / template content that should be render, in case the
+ * if-expression (to which the else-expression belongs) evaluates to false.
+ *
+ * Properties for FOR type:
+ *
+ * forControlType {String}: the type of for-loop, either FORITER or FORSTEPforInitEval {Function}: the initialization statement of the for-expression, compiled into
+ * a Function. The function takes one argument: the current data-object.FORITER: @for(PROP in OBJ){ ... }@
+ *
+ * forIterator {Object}: an iterator object with functions hasNext() : Boolean and
+ * next() : String (which returns the name of the property currently iterated).forPropName {String}: the variable name for the property which is currently iterated over.
+ * FORSTEP: @for(INIT; CONDITION; INCREMENT){ ... }@
+ *
+ * forConditionEval {Function}: the condition statement of the for-expression, compiled into
+ * a Function. The function takes one argument: the current data-object.forIncrementEval {Function}: the increment statement of the for-expression, compiled into
+ * a Function. The function takes one argument: the current data-object.
+ * content {ContentElement}: the HTML / template content that should be rendered
+ * during each iteration of the for-loop.
+ *
+ * Properties for RENDER type:
+ *
+ * partial : the name of the partial viewpartialType : the type of the partial
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStartcontroller : the name of the controller, to which the partial view definition belongscontrollerType : the type of the controller
+ * field: one of StringLiteral, Identifier, IdentifierNameAmpersatStartargsEval {Function}: OPTIONALLY compiled getter Function for retrieving the current ARGS
+ * (optional argument) of the render expression. The function takes one argument: the current data-object.
+ *
+ * Properties for ESCAPE_ENTER type:
+ *
+ * text {String}: the text that will be rendered (i.e. without the escape-character(s) itself).
+ *
+ * Properties for ESCAPE_EXIT type:
+ *
+ * text {String}: the text that will be rendered (i.e. without the escape-character(s) itself).
+ *
+ * Properties for VAR_DECLARATION type:
+ *
+ * name : the name for the variable (without the leading @ of template variables)nameType : the type of the name field: StringLiteral
+ *
+ *
+ *
* @class ParsingResult
* @param {org.antlr.runtime.CommonTokenStream} thetokens (optional) the TokenStream that corresponds to this parsed element;
* when provided, the TokenStream is used to set the start- and end-
@@ -168,10 +294,22 @@ mobileDS.parser.ParsingResult.prototype.getValue = function(rawPropertyValue, pr
return rawPropertyValue.substring(1, rawPropertyValue.length-1);
}
else if(proptertyType === 'Identifier'){
- return data['@' + rawPropertyValue];
+ if(data){
+ return data['@' + rawPropertyValue];
+ }
+ else {
+ //just return variable name
+ return rawPropertyValue;
+ }
}
else if(proptertyType === 'IdentifierNameAmpersatStart'){
- return data[rawPropertyValue];
+ if(data){
+ return data[rawPropertyValue];
+ }
+ else {
+ //just return variable name, but remove leading @:
+ return rawPropertyValue.substring(1);
+ }
}
else if(proptertyType === 'OBJECT'){
return rawPropertyValue;//TODO
@@ -315,3 +453,88 @@ mobileDS.parser.ParsingResult.prototype.getCallDataType = function(){
return this.dataType;
};
+mobileDS.parser.ParsingResult.prototype.stringify = function(){
+
+ //TODO use constants for lists
+
+ //typed properties:
+ // for each typed properties '' there is an additional property with name 'Type'
+ // (both of these properties are Strings themselves)
+ var typedPropList = [
+ 'scriptPath',
+ 'stylePath',
+ 'name',
+ 'helper',
+ 'partial',
+ 'controller'
+ ];
+
+ //primitive-type properties:
+ // write values 'as is' for these properties
+ var propList = [
+ 'start',
+ 'end',
+ 'type',
+ 'dataType',
+ 'text',
+ 'forControlType',
+ 'forPropName'
+ ];
+
+ //"stringify-able" object properties:
+ var strPropList = [
+ 'content',
+ 'elseContent'
+ ];
+
+ //function properties:
+ var funcPropList = [
+ 'scriptEval',
+ 'argsEval',
+ 'ifEval',
+ 'forInitEval',
+ 'forIterator',
+ 'forConditionEval',
+ 'forIncrementEval'
+ ];
+
+
+ //function for iterating over the property-list and generating JSON-like entries in the string-buffer
+ var appendStringified = mobileDS.parser.appendStringified;
+
+ var sb = ['mobileDS.parser.restoreObject({ classConstructor: ["mobileDS","parser","ParsingResult"]', ','];
+
+ //TODO property dataPos: {start: Number, end: Number}
+ if(this['dataPos']){
+ sb.push( 'dataPos:{start:' );
+ sb.push( this.dataPos.start );
+ sb.push( ',end:' );
+ sb.push( this.dataPos.end );
+ sb.push( '}' );
+ //NOTE: need to add comma in a separate entry
+ // (-> in order to not break the removal method of last comma, see below)
+ sb.push( ',' );
+ }
+
+
+ appendStringified(this, typedPropList, sb);
+ appendStringified(this, typedPropList, sb, 'Type');
+ appendStringified(this, propList, sb);
+ //non-primitives with stringify() function:
+ appendStringified(this, strPropList, sb, null, function valueExtractor(name, value){
+ return value.stringify();
+ });
+ //function values
+ appendStringified(this, funcPropList, sb, null, function valueExtractor(name, value){
+ return value.toString();
+ });
+
+ //if last element is a comma, remove it
+ if(sb[sb.length - 1] === ','){
+ sb.splice( sb.length - 1, 1);
+ }
+
+ sb.push(' })');
+ return sb.join('');
+};
+
diff --git a/assets/www/mmirf/mvc/parser/storageUtils.js b/assets/www/mmirf/mvc/parser/storageUtils.js
new file mode 100644
index 0000000..5a2c99b
--- /dev/null
+++ b/assets/www/mmirf/mvc/parser/storageUtils.js
@@ -0,0 +1,177 @@
+
+/**
+ * Dependencies:
+ *
+ * @depends jQuery.extend
+ *
+ * alternatively: set mobileDS.parser.CLASS_EXTENDER with an object that
+ * exposes a function extend(obj1,obj1) , i.e.
+ *
+ * mobileDS.parser.CLASS_EXTENDER.extend(obj1, obj2)
+ *
+ * @module mobileDS.tools
+ *
+ */
+var mobileDS = window.mobileDS || {};
+mobileDS.parser = mobileDS.parser || {};
+
+/**
+ * Creates the appropriate object from a JSON-like storedObject .
+ *
+ *
+ * NOTE that in difference to a real JSON object, the storedObject
+ * may contain function definitions.
+ *
+ *
+ * The storedObject must have a String property classConstructor
+ *
+ * that must correspond to a constructor function (which will be invoked with new )
+ * the constructor function must be invokable without parameters
+ * the constructor function must be accessable from the global namespace
+ * (or classConstuctor must contain the code for retrieving the constructor
+ * function from the global namespace)
+ *
+ *
+ *
+ *
+ * If storedObject contains a function init , then this function will be invoked
+ * before returning the new newly created object.
+ *
+ *
+ * @function
+ * @static
+ * @public
+ *
+ * @param {Object} storedObject
+ * a JSON-like object with fields and functions (which will be transfered to the returned object).
+ * @returns {Object} an new instance created with the constructor classConstructor and
+ * set with all properties (fields and functions) from storedObject .
+ */
+mobileDS.parser.restoreObject = function(storedObject, isTriggerPublish){
+ var classExtender;
+ if(mobileDS.parser.CLASS_EXTENDER && typeof mobileDS.parser.CLASS_EXTENDER.extend === 'function'){
+ classExtender = mobileDS.parser.CLASS_EXTENDER;
+ }
+ else {
+ classExtender = jQuery;
+ }
+
+ //NOTE: classConstructor contains a list of Strings:
+ // * the constructor-function is either in global namespace
+ // e.g. "View" -> then the list contains exactly one entry ["View"]
+ //
+ // * if the constructor-function is in a sub-namespace (e.g. "sub-module")
+ // then the list contains the "path" to the constructorf-function
+ // starting with the module that is in the global namespace
+ // e.g. "mobileDS.parser.ParsingResult" -> ["mobileDS, "parser", "ParsingResult"]
+ //
+ var constructor = window[storedObject.classConstructor[0]];
+ for(var i=1, size = storedObject.classConstructor.length; i < size; ++i){
+ constructor = constructor[storedObject.classConstructor[i]];
+ }
+ var obj = classExtender.extend( new constructor(), storedObject);
+ if(typeof obj.init === 'function'){
+ obj.init();
+ }
+
+ if(isTriggerPublish && typeof obj.initPublish === 'function'){
+ obj.initPublish();
+ }
+
+ return obj;
+};
+
+/**
+ * Creates String-representations (JSON-like) for the specified properties and appends them to the StringBuffer.
+ *
+ *
+ * This function iterates over the Array propertyNames :
+ * If a property with that name exists in obj , a JSON-like String-representation is generated
+ * and appended at the end of the array stringBuffer .
+ * ',' in stringBuffer .
+ * stringBuffer is a comma entry ',' if at least one property
+ * entry was inserted in stringBuffer .
+ *
+ *
+ * NOTE that the String-representation inserted into stringBuffer may not have a 1:1 correspondence
+ * with properties (only the last entry is guaranteed to be ',', if a property was inserted).
+ * stringBuffer should be converted into a String
+ * e.g. by stringBuffer.join('').
+ *
+ *
+ * @function
+ * @static
+ * @public
+ *
+ * @param {Object} obj
+ * the object, that contains the properties for which String representations should be generated.
+ * @param {Array} propertyNames
+ * the names of the properties, for which String-representations should be generated.
+ * @param {Array} stringBuffer
+ * the buffer: String-representations will be appended as entries at the end of the buffer
+ * @param {String} [propertyNamePostfix]
+ * OPTIONAL if present, this postfix will be appended to each property name, before processing it.
+ * This is a convenience method, e.g. if all properties in propertyNames should end with
+ * the same String / postfix.
+ * @param {Function} [valueFunc]
+ * OPTIONAL by default, value representations are generated using the JSON.stringify
+ * function. If instead this argument is present, this function will be invoked for creating
+ * the string representation of the property-value.
+ * The function signature is valueFunc(propertyName : String, propertyValue : Object) : String.
+ *
+ * @returns {Array} the modified stringBuffer
+ *
+ * @depends JSON.stringify
+ *
+ * @example
+ *
+ * var obj = {
+ * some: "properties",
+ * including: function(arg1,arg2){ return 'functions' }
+ * };
+ *
+ * var sb = mobileDS.parser.appendStringified(obj, ['some'], []);
+ * var str = sb.join(',');
+ * //str will be: "some:\"properties\","
+ *
+ */
+mobileDS.parser.appendStringified = function(obj, propertyNames, stringBuffer, propertyNamePostfix, valueFunc){
+
+ //"shift" arguments, if necessary
+ if(typeof propertyNamePostfix === 'function' && ! valueFunc){
+ valueFunc = propertyNamePostfix;
+ propertyNamePostfix = null;
+ }
+
+ var prop, val;
+ for(var i=0, size = propertyNames.length; i < size; ++i){
+ prop = propertyNames[i];
+
+ if(propertyNamePostfix){
+ prop += propertyNamePostfix;
+ }
+
+ if(typeof obj[prop] === 'undefined'){
+ continue;
+ }
+
+
+ if(valueFunc){
+ val = valueFunc(prop, obj[prop]);
+ }
+ else {
+ val = JSON.stringify(obj[prop]);
+ }
+
+ stringBuffer.push( prop );
+ stringBuffer.push( ':' );
+ stringBuffer.push( val );
+
+ stringBuffer.push( ',' );
+ }
+
+ return stringBuffer;
+};
\ No newline at end of file
diff --git a/assets/www/mmirf/mvc/parser/templateParseUtils.js b/assets/www/mmirf/mvc/parser/templateParseUtils.js
index caf705a..2a606d5 100644
--- a/assets/www/mmirf/mvc/parser/templateParseUtils.js
+++ b/assets/www/mmirf/mvc/parser/templateParseUtils.js
@@ -61,7 +61,7 @@ var parserPrintError = function(prefix, msg){//FIXME
*
* If lineNo is <= 1, the function returns always 0.
*
- * If the lineNo is greater than the count of lins in str, the string length itself is returned.
+ * If the lineNo is greater than the count of lines in str, the string length itself is returned.
*
* @function getIndexForLine
* @param {String} str the string
@@ -81,6 +81,10 @@ var getIndexForLine = (function(){
break;
}
}
+
+ //reset regexpr:
+ detectLinebreak.lastIndex = 0;
+
if(match){
return match.index + match[1].length;
}
@@ -129,6 +133,10 @@ var getLineForIndex = (function(){
}
++count;
}
+
+ //reset regexpr:
+ detectLinebreak.lastIndex = 0;
+
if(match){
//need to reset regexpr for next call:
detectLinebreak.test(str);
@@ -150,6 +158,10 @@ extractErrorPosition = (function(){
return function extractErrorPositionImpl(msg, offset, originalContent){
// console.log('\nTEST1_extractErrorPositionImpl with arguments '+arguments.length+'\n');
var result = detectLine.exec(msg);
+
+ //reset regexpr:
+ detectLine.lastIndex = 0;
+
// console.log('\nTEST2_result for "'+msg+'": '+result+'\n');
var pos = null;
if(result){
@@ -175,7 +187,7 @@ extractErrorPosition = (function(){
}
}
return pos;
- }
+ };
})();
var CURRENT_PARSED_VIEW = null;//FIXME
diff --git a/assets/www/mmirf/mvc/parser/templateRenderUtils.js b/assets/www/mmirf/mvc/parser/templateRenderUtils.js
index 4b3ccda..bb54728 100644
--- a/assets/www/mmirf/mvc/parser/templateRenderUtils.js
+++ b/assets/www/mmirf/mvc/parser/templateRenderUtils.js
@@ -309,7 +309,7 @@ mobileDS.parser.RenderUtils = (function(){
}
function getRenderingBuffer(renderingBuffer){
- if(renderingBuffer && isArray(renderingBuffer))
+ if(renderingBuffer)// && isArray(renderingBuffer))
return renderingBuffer;
return new Array();
@@ -617,7 +617,9 @@ mobileDS.parser.RenderUtils = (function(){
}
//NOTE all template-vars start with special char @
- var fieldName = '@'+ elem.getValue(elem.name, elem.nameType, data);
+// var fieldName = '@'+ elem.getValue(elem.name, elem.nameType, data);
+ var varName = elem.getValue(elem.name, elem.nameType);//FIXME: do not invoke with data; we only want the VAR-name!//, data);
+ var fieldName = '@'+ varName;
//initialize field for var-declaration
if(typeof data[fieldName] === 'undefined'){
@@ -632,6 +634,7 @@ mobileDS.parser.RenderUtils = (function(){
// --> (a) we need to store the value here when var already exists
// (b) on parsing JS code we need to consider var-declarations, i.e. @-variables
// that are proceeded with a 'var'-statement, e.g.: 'var @varName = ...'
+
}
// TODO handle case when field already exists (?)
diff --git a/assets/www/mmirf/mvc/views/contentElement.js b/assets/www/mmirf/mvc/views/contentElement.js
index 1a58191..507d943 100644
--- a/assets/www/mmirf/mvc/views/contentElement.js
+++ b/assets/www/mmirf/mvc/views/contentElement.js
@@ -38,11 +38,16 @@
* @category core
*/
function ContentElement(group, view, parser, renderer){
+
+ this.localizer = mobileDS.LanguageManager.getInstance();
+
+ if(arguments.length === 0){
+ return this;
+ }
//TODO externalize as constant
var SUB_ELEMENT_NAME = "@fragment";
- this.localizer = mobileDS.LanguageManager.getInstance();
this.parser = parser;
this.renderer = renderer;
this.view = view;
@@ -147,9 +152,60 @@ function ContentElement(group, view, parser, renderer){
// var func = new Function(mobileDS.parser.element.DATA_NAME, strFuncBody);
// func.name = strFuncName;
- //NOTE: need a dummy variable to catch and return the create function-definition in the eval-statement
- // (the awkward 'var dummy=...;dummy'-construction avoids leaking the dummy-var into the
- // global name-space, where the last ';dummy' represent the the return-statement for eval(..) )
+
+// //TEST use import/export VARs instead of data-object access:
+// //
+// //IMPORT
+// // * make properties of DATA available as local variables
+// // * synchronize the DATA properties to local variables (with property getters/setters)
+// //EXPORT
+// // * on exit: commit values of local variables to their corresponding DATA-fields (and remove previously set "sync"-code)
+// //
+// var dataFieldName = mobileDS.parser.element.DATA_NAME;
+//
+// //TODO do static "import" without eval(): only import VARs that were declared by @var() before!
+// // ... also (OPTIMIZATION): during JS-parsing, gather/detect VARIABLE occurrences -> only import VAR if it gets "mentioned" in the func-body! (need to detect arguments vs. variables for this!)
+// var iteratorName = '__$$ITER$$__';//<- iterator name (for iterating over DATA fields)
+// var varIteratorStartSrc = 'for(var '+iteratorName+' in '+dataFieldName+'){\
+// if('+dataFieldName+'.hasOwnProperty('+iteratorName+')){';//<- TODO? add check, if field-name starts with @?
+// var varIteratorEndSrc = '}}';
+//
+// var importDataSrc = varIteratorStartSrc
+// //create local variable, initialized with the DATA's value
+// + 'eval("var "+'+iteratorName+'.substring(1)+" = '+dataFieldName+'[\'"+'+iteratorName+'+"\'];");'
+// //"synchronize" the DATA object to to the created local variable
+// + 'Object.defineProperty('+dataFieldName+', '+iteratorName+',{\
+// configurable : true,\
+// enumerable : true,\
+// set: eval("var dummy1 = function set(value){\\n "+'+iteratorName+'.substring(1)+" = value;\\n };dummy1"),\
+// get: eval("var dummy2 = function get(){\\n return "+'+iteratorName+'.substring(1)+";\\n };dummy2")\
+// });'
+// + varIteratorEndSrc;
+//
+// //TODO do not define "export" with the function itself, since there may be problems due to return statements etc.
+// // ... instead: do the "export" after the function was invoked, i.e. obj.evalScript() etc. in renderer
+// var exportDataSrc = varIteratorStartSrc
+// //DISABLED: use defineProperty() instead (see below) ... this would use the "proxy"/"sync" mechanism..
+//// + 'eval("'+dataFieldName+'[\'"+'+iteratorName+'+"\'] = "+'+iteratorName+'.substring(1)+";");'
+//
+// //reset to DATA property to normal behavior
+// // i.e. remove proxy-behavior by removing the getter/setter
+// // and setting to current value
+// + 'Object.defineProperty('+dataFieldName+', '+iteratorName+',{\
+// value : '+dataFieldName+'['+iteratorName+'],\
+// writable : true,\
+// configurable : true,\
+// enumerable : true\
+// });'
+// + varIteratorEndSrc;
+//
+// var func = eval( 'var dummy=function '+strFuncName+'('+mobileDS.parser.element.DATA_NAME+'){'
+// + importDataSrc + strFuncBody +';'+exportDataSrc+'};dummy' );//<- FIXME WARING: export does not work correctly, if there is a return-statement in the outermost scope of the strFuncBody!
+
+
+// //NOTE: need a dummy variable to catch and return the create function-definition in the eval-statement
+// // (the awkward 'var dummy=...;dummy'-construction avoids leaking the dummy-var into the
+// // global name-space, where the last ';dummy' represent the the return-statement for eval(..) )
var func = eval( 'var dummy=function '+strFuncName+'('+mobileDS.parser.element.DATA_NAME+'){'+strFuncBody+'};dummy' );
return func;
@@ -376,7 +432,7 @@ ContentElement.prototype.getView = function(){
* @public
*/
ContentElement.prototype.getController = function(){
- return this.view.getController();
+ return this.getView().getController();
};
/**
@@ -426,6 +482,134 @@ ContentElement.prototype.hasDynamicContent = function(){
return this.internalHasDynamicContent;
};
+ContentElement.prototype.stringify = function(){
+
+ //TODO use constants for lists
+
+ //primitive-type properties:
+ // write values 'as is' for these properties
+ var propList = [
+ 'name',
+ 'definition',
+ 'start',
+ 'end',
+ 'internalHasDynamicContent'
+ ];
+
+ //Array-properties
+ var arrayPropList = [
+ 'allContentElements' //element type: ParsingResult (stringify-able)
+ ];
+
+
+// //SPECIAL: store view by getter function initView: use the view's name view {View} -> 'viewName' {String}, 'ctrlName' {String}
+//
+// //USED BY RENDERER:
+//// allContentElements
+//// definition
+//// getRawText() == definition
+//// getController() (by view)
+//
+// //SPECIAL: store renderer by getter function initRenderer
+//
+// //function properties:
+// var funcPropList = [
+// 'initView',
+// 'initRenderer'
+// ];
+
+
+ //function for iterating over the property-list and generating JSON-like entries in the string-buffer
+ var appendStringified = mobileDS.parser.appendStringified;
+
+ var sb = ['mobileDS.parser.restoreObject({ classConstructor: ["ContentElement"]', ','];
+
+ appendStringified(this, propList, sb);
+
+ //non-primitives array-properties with stringify() function:
+ appendStringified(this, arrayPropList, sb, null, function arrayValueExtractor(name, arrayValue){
+
+ var buf =['['];
+ for(var i=0, size = arrayValue.length; i < size; ++i){
+ buf.push(arrayValue[i].stringify());
+ buf.push(',');
+ }
+ //remove last comma
+ if(arrayValue.length > 0){
+ buf.splice( buf.length - 1, 1);
+ }
+ buf.push(']');
+
+ return buf.join('');
+ });
+
+ //TODO is there a better way to store the view? -> by its name and its contoller's name, and add a getter function...
+ if(this['view']){
+ //getter/setter function for the view/controller
+ // (NOTE: needs to be called before view/controller can be accessed!)
+ sb.push( 'initView: function(){');
+
+ // store view-name:
+ sb.push( ' var viewName = ');
+ sb.push( JSON.stringify(this.getView().getName()) );
+
+ // store controller-name:
+ sb.push( '; var ctrlName = ');
+ sb.push( JSON.stringify(this.getController().getName()) );
+
+ // ... and the getter/setter code:
+ sb.push( '; this.view = mobileDS.PresentationManager.getInstance().get');
+ sb.push(this['view'].constructor.name);//<- insert getter-name dependent on the view-type (e.g. View, Partial)
+ sb.push('(ctrlName, viewName); this.getView = function(){return this.view;}; return this.view; },' );
+
+
+ sb.push( 'getView: function(){ return this.initView();}');
+
+ //NOTE: need to add comma in a separate entry
+ // (-> in order to not break the removal method of last comma, see below)
+ sb.push( ',' );
+ }
+
+ //TODO is there a better way to store the renderer? -> by a getter function...
+ if(this['renderer']){
+ //getter/setter function for the (default) renderer
+ // (NOTE: needs to be called before view/controller can be accessed!)
+ sb.push( 'initRenderer: function(){');
+ // ... and the getter/setter code:
+ sb.push( ' this.renderer = mobileDS.parser.RenderUtils.getInstance(); }' );
+
+ //NOTE: need to add comma in a separate entry
+ // (-> in order to not break the removal method of last comma, see below)
+ sb.push( ',' );
+ }
+
+ if(this['renderer'] || this['view']){
+ //add initializer function
+ // (NOTE: needs to be called before view/controller or renderer can be accessed!)
+ sb.push( 'init: function(){');
+
+ if(this['renderer']){
+ sb.push( ' this.initRenderer(); ' );
+ }
+// if(this['view']){
+// sb.push( ' this.initView(); ' );
+// }
+ sb.push( ' }' );
+
+ //NOTE: need to add comma in a separate entry
+ // (-> in order to not break the removal method of last comma, see below)
+ sb.push( ',' );
+ }
+
+ //if last element is a comma, remove it
+ if(sb[sb.length - 1] === ','){
+ sb.splice( sb.length - 1, 1);
+ }
+
+ sb.push(' })');
+ return sb.join('');
+};
+
//MOVED to renderContentElement in ParserUtils
///** @private */
//ContentElement.prototype.doGetStringForElement = function(element, data){
diff --git a/assets/www/mmirf/mvc/views/layout.js b/assets/www/mmirf/mvc/views/layout.js
index e1eb6ca..0aa5167 100644
--- a/assets/www/mmirf/mvc/views/layout.js
+++ b/assets/www/mmirf/mvc/views/layout.js
@@ -50,7 +50,7 @@ Layout.REMOTE_RESOURCES_ATTR_VALUE = 'remote';
* @param {String} definition layout description
* @category core
*/
-function Layout(name, definition, remote){
+function Layout(name, definition, remote, ignoreMissingBody){
// console.log("[Layout] initialize '"+name+"'.");
//FIXME MODIFICATIONS for "remote content layout object":
@@ -67,7 +67,7 @@ function Layout(name, definition, remote){
* @type Object
* @public
*/
- this.def = definition.replace(mobileDS.CommonUtils.getInstance().regexHTMLComment, '');//remove HTML comments!
+ this.def = definition? definition.replace(mobileDS.CommonUtils.getInstance().regexHTMLComment, '') : definition;//remove HTML comments!
/**
* The name of the layout.
@@ -116,263 +116,307 @@ function Layout(name, definition, remote){
*/
this.yields = new Array();
- var parser = mobileDS.parser.ParserUtils.getInstance();
- var renderer = mobileDS.parser.RenderUtils.getInstance();
-
- //console.debug('Layout: start rendering layout for "'+this.name+'"'+(remote?' (REMOTE)':'')+', RAW: '+this.def);
-
- var parseResult = parser.parse(this.def, this);
- var renderedLayout = renderer.renderLayout(parseResult, null/*FIXME?*/);
-
- //NOTE: parsing a string as HTML via jQuery etc. does not work (removes head, body,... tags):
-// var doc = new DOMParser().parseFromString(renderedLayout, "text/html");
-// if(!doc){
-// doc = document.implementation.createHTMLDocument('LAYOUT');
-// }
-// var $layout = $(doc);//$.parseHTML(renderedLayout, doc);
-//
-// var headerElements = $('head', $layout);
-// for(var i=0, size = headerElements.length; i < size; ++i){
-// this.headerContents += headerElements[i].outerHTML;
-// }
-//
-// var bodyElement = $('body', $layout);
-// this.bodyContents = bodyElement.html();
-// var dialogElement = $('dialogs', $layout);
-// this.dialogsContents = dialogElement.html();
-//
-
-
-// //TODO remove this (replace with HTML parser)
-
- var self = this;
-
- //TODO these should be constants (remove to constants.js?):
- this.markerAttributeName = Layout.REMOTE_RESOURCES_ATTR_NAME;
- this.markerAttributeValue = Layout.REMOTE_RESOURCES_ATTR_VALUE;
- this.markerUseSingleQuotes = false;//<- set value enclosed in single-quotes (true) or double-quotes (false)
-
- //appends the marker attribute for "signaling"/marking that a
- // script/style/link-TAG was parsed&evaluated by this layout object
- var addMarkerAttribute = function(strStartOfTag){
- return strStartOfTag + ' '
- + self.markerAttributeName + '='
- + (self.markerUseSingleQuotes? '\'': '"')
- + self.markerAttributeValue
- + (self.markerUseSingleQuotes? '\'': '"')
- ;
- };
-
- //pure HTML:
- // (1) removed all HTML comments (via RegExpr)
- // (2) removed template comments (via parser/renderer)
- var pureHtml = renderedLayout;
-
- var regExprTagContent = //match one of the following (as groups):
- '(('+ //match as groups
- '('+ //(1) CDATA: this may contain anything, even a closing script-statement
- ''+ //...for the CDATA-closing statement: ]]>
- // (i.e. the first time we encounter this, we stop)
- ')'+ //close group for CDATA-matching
-
- '|[\\r\\n]'+ //(2) OR line breaks \r and \n (in any combination)
-//DISABLED (using . instead!): '|[^<]'+ //(3) OR any symbol that is NOT <
- '|.'+ //(4) OR any symbol (REQUIRED for allowing <-symbol within script!
- ')'+ //close group
- '*'+ //match this any number of times (or even none)
- '?'+ //do matching non-greedy (i.e. until the next pattern in the RegExpr can be matched the first time)
-
- ')'; //close outer group (i.e. one group for ALL content that is matched)
-
- //_non-greedy_ RegExpr for
- // * any line-break: \r or \n or a combination of them
- // * any other character but < (less-symbol); note that this itself does not include line breaks
- var regExprTagInternal = '('+ //open group: match as a group (i.e. give access to the matched content via an index in the RegExpr object)
- '[\\r\\n]'+ //line breaks \r and \n
- '|'+ //OR
- '[^<]'+ //any symbol that is NOT <
- ')'+ //close group
- '*'+ //match this any number of times (or even none)
- '?'; //do matching non-greedy (i.e. until the next pattern in the RegExpr can be matched the first time)
-
-
- //matching:
- // or:
-// var regExpScriptTag = /(()((()|[\r\n]|.)*?)(<\/script>))|()(())|()'+regExprTagContent+'())'+ //DETECT "normal" script-TAG with optional content
- '|()(([\r\n]|[^<])*?)(<\/script>))|()((()|[\r\n]|.)*?)(<\/script>))|()((()|[\r\n]|.)*?)(<\/script>))|()(())|()'+regExprTagContent+'())'+ //DETECT "normal" script-TAG with optional content
+ '|()(([\r\n]|[^<])*?)(<\/script>))|()((()|[\r\n]|.)*?)(<\/script>))|(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [
+ ]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ H*
+
+
+ H
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/js-from-topo-sort-list-generator.xsl b/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/js-from-topo-sort-list-generator.xsl
new file mode 100644
index 0000000..b10a017
--- /dev/null
+++ b/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/js-from-topo-sort-list-generator.xsl
@@ -0,0 +1,49 @@
+
+
+
+
+
+ require.def(
+
+ "
+ "text!
+ "text!
+
+
+ ,
+
+
+ ],
+ "code" :
+
+
diff --git a/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/py-from-topo-sort-list-generator.xsl b/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/py-from-topo-sort-list-generator.xsl
new file mode 100644
index 0000000..6477527
--- /dev/null
+++ b/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/py-from-topo-sort-list-generator.xsl
@@ -0,0 +1,29 @@
+
+
+
+
+
+config = {
+ "transformations": [
+
+
+ " " ,
+
+ ],
+ "code" : " "
+}
+
+
+
+
+
diff --git a/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl b/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl
new file mode 100644
index 0000000..c20edf0
--- /dev/null
+++ b/build/lib/commons-scxml-js/src/xslt/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl
@@ -0,0 +1,23 @@
+
+
+
+
+ cat $1 |
+
+ xsltproc - | \
+
+ xsltproc -
+
+
+
+
+
diff --git a/build/lib/commons-scxml-js/src/xslt/util/preprocess_import.xsl b/build/lib/commons-scxml-js/src/xslt/util/preprocess_import.xsl
new file mode 100644
index 0000000..7b72398
--- /dev/null
+++ b/build/lib/commons-scxml-js/src/xslt/util/preprocess_import.xsl
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/lib/commons-scxml-js/src/xslt/util/scxml-to-dot.xsl b/build/lib/commons-scxml-js/src/xslt/util/scxml-to-dot.xsl
new file mode 100644
index 0000000..4fe4ced
--- /dev/null
+++ b/build/lib/commons-scxml-js/src/xslt/util/scxml-to-dot.xsl
@@ -0,0 +1,289 @@
+
+
+
+
+
+
+
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+
+
+ label=<<TABLE>
+
+ <TR>
+ <TD colspan=" ">
+ </TD>
+ </TR>
+
+
+ <TR>
+ <TD>
+ </TD>
+
+ <TD>
+
+
+ </TD>
+
+
+ <TD>
+ </TD>
+
+ </TR>
+
+ </TABLE>>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ subgraph cluster_
+
+ color="blue";
+
+
+ color="black";
+
+
+
+
+ style="rounded,
+
+
+ dashed
+
+
+ solid
+
+
+ ";
+
+
+
+
+ label="
+ _static_reactions
+ [
+
+
+ shape=none];
+
+
+ }
+
+
+ [shape=box, style="rounded"];
+
+
+
+
+
+ [shape=box, style="rounded,filled",fillcolor=gray];
+
+
+
+ [shape=point,width=.15];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ltail=cluster_
+
+ lhead=cluster_
+
+
+
+
+
+
+
+
+ label="
+
+ [
+ ]
+
+
+ /
+
+
+
+ "
+
+
+
+ ];
+
+
+
diff --git a/build/lib/commons-scxml-js/src/xslt/util/topo-sort.xsl b/build/lib/commons-scxml-js/src/xslt/util/topo-sort.xsl
new file mode 100644
index 0000000..dd61d2e
--- /dev/null
+++ b/build/lib/commons-scxml-js/src/xslt/util/topo-sort.xsl
@@ -0,0 +1,222 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/lib/commons-scxml-js/target/apidocs/META-INF/LICENSE.txt b/build/lib/commons-scxml-js/target/apidocs/META-INF/LICENSE.txt
new file mode 100644
index 0000000..75b5248
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/apidocs/META-INF/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/build/lib/commons-scxml-js/target/apidocs/META-INF/NOTICE.txt b/build/lib/commons-scxml-js/target/apidocs/META-INF/NOTICE.txt
new file mode 100644
index 0000000..c328148
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/apidocs/META-INF/NOTICE.txt
@@ -0,0 +1,5 @@
+Apache Commons SCXML Code Generation Framework, JavaScript Edition
+Copyright 2010 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
diff --git a/build/lib/commons-scxml-js/target/language-frontend-modules/js/StatePatternStatechartGenerator.js b/build/lib/commons-scxml-js/target/language-frontend-modules/js/StatePatternStatechartGenerator.js
new file mode 100644
index 0000000..b58aef7
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/language-frontend-modules/js/StatePatternStatechartGenerator.js
@@ -0,0 +1,98 @@
+
+
+ require.def(
+
+ "target/language-frontend-modules/js/StatePatternStatechartGenerator",
+ [
+
+ "text!target/xsl/ir-compiler/normalizeInitialStates.xsl",
+
+ "text!target/xsl/ir-compiler/generateUniqueInitialStateIds.xsl",
+
+ "text!target/xsl/ir-compiler/generateUniqueStateIds.xsl",
+
+ "text!target/xsl/ir-compiler/nameTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/transformIf.xsl",
+
+ "text!target/xsl/ir-compiler/addDefaultTransitionToHistoryStates.xsl",
+
+ "text!target/xsl/ir-compiler/appendBasicStateInformation.xsl",
+
+ "text!target/xsl/ir-compiler/appendStateInformation.xsl",
+
+ "text!target/xsl/ir-compiler/splitTransitionTargets.xsl",
+
+ "text!target/xsl/ir-compiler/changeTransitionsPointingToCompoundStatesToPointToInitialStates.xsl",
+
+ "text!target/xsl/ir-compiler/computeLCA.xsl",
+
+ "text!target/xsl/ir-compiler/appendTransitionInformation.xsl",
+
+ "text!target/xsl/layout/addTransitionTargetIds.xsl",
+
+ "text!target/xsl/ir-compiler/addNearestParallelDescendantOfLCAToTransition.xsl",
+
+ "text!target/xsl/ir-compiler/copyEnumeratedEventTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/enumerateEvents.xsl",
+
+ "text!target/xsl/ir-compiler/addEventRegularExpressions.xsl",
+
+ "text!target/xsl/ir-compiler/expandStarEvent.xsl",
+
+ "text!target/xsl/backends/js/StatePatternStatechartGenerator.xsl"
+ ],
+
+ function(
+
+ js_var_1,
+ js_var_2,
+ js_var_3,
+ js_var_4,
+ js_var_5,
+ js_var_6,
+ js_var_7,
+ js_var_8,
+ js_var_9,
+ js_var_10,
+ js_var_11,
+ js_var_12,
+ js_var_13,
+ js_var_14,
+ js_var_15,
+ js_var_16,
+ js_var_17,
+ js_var_18,
+ js_var_19
+ ){
+
+ return {
+ "transformations" : [
+ js_var_1,
+ js_var_2,
+ js_var_3,
+ js_var_4,
+ js_var_5,
+ js_var_6,
+ js_var_7,
+ js_var_8,
+ js_var_9,
+ js_var_10,
+ js_var_11,
+ js_var_12,
+ js_var_13,
+ js_var_14,
+ js_var_15,
+ js_var_16,
+ js_var_17,
+ js_var_18
+ ],
+ "code" : js_var_19
+
+ };
+
+
+ }
+ );
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/language-frontend-modules/js/StateTableStatechartGenerator.js b/build/lib/commons-scxml-js/target/language-frontend-modules/js/StateTableStatechartGenerator.js
new file mode 100644
index 0000000..1daef7c
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/language-frontend-modules/js/StateTableStatechartGenerator.js
@@ -0,0 +1,110 @@
+
+
+ require.def(
+
+ "target/language-frontend-modules/js/StateTableStatechartGenerator",
+ [
+
+ "text!target/xsl/ir-compiler/normalizeInitialStates.xsl",
+
+ "text!target/xsl/ir-compiler/generateUniqueInitialStateIds.xsl",
+
+ "text!target/xsl/ir-compiler/generateUniqueStateIds.xsl",
+
+ "text!target/xsl/ir-compiler/positionTransitionsAfterSubstates.xsl",
+
+ "text!target/xsl/ir-compiler/transformIf.xsl",
+
+ "text!target/xsl/ir-compiler/addDefaultTransitionToHistoryStates.xsl",
+
+ "text!target/xsl/ir-compiler/appendBasicStateInformation.xsl",
+
+ "text!target/xsl/ir-compiler/appendStateInformation.xsl",
+
+ "text!target/xsl/ir-compiler/splitTransitionTargets.xsl",
+
+ "text!target/xsl/ir-compiler/changeTransitionsPointingToCompoundStatesToPointToInitialStates.xsl",
+
+ "text!target/xsl/ir-compiler/computeLCA.xsl",
+
+ "text!target/xsl/layout/addTransitionTargetIds.xsl",
+
+ "text!target/xsl/ir-compiler/addNearestParallelDescendantOfLCAToTransition.xsl",
+
+ "text!target/xsl/ir-compiler/flattenTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/nameTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/appendTransitionInformation.xsl",
+
+ "text!target/xsl/ir-compiler/copyEnumeratedEventTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/enumerateEvents.xsl",
+
+ "text!target/xsl/ir-compiler/numberStatesAndTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/addEventRegularExpressions.xsl",
+
+ "text!target/xsl/ir-compiler/expandStarEvent.xsl",
+
+ "text!target/xsl/backends/js/StateTableStatechartGenerator.xsl"
+ ],
+
+ function(
+
+ js_var_1,
+ js_var_2,
+ js_var_3,
+ js_var_4,
+ js_var_5,
+ js_var_6,
+ js_var_7,
+ js_var_8,
+ js_var_9,
+ js_var_10,
+ js_var_11,
+ js_var_12,
+ js_var_13,
+ js_var_14,
+ js_var_15,
+ js_var_16,
+ js_var_17,
+ js_var_18,
+ js_var_19,
+ js_var_20,
+ js_var_21,
+ js_var_22
+ ){
+
+ return {
+ "transformations" : [
+ js_var_1,
+ js_var_2,
+ js_var_3,
+ js_var_4,
+ js_var_5,
+ js_var_6,
+ js_var_7,
+ js_var_8,
+ js_var_9,
+ js_var_10,
+ js_var_11,
+ js_var_12,
+ js_var_13,
+ js_var_14,
+ js_var_15,
+ js_var_16,
+ js_var_17,
+ js_var_18,
+ js_var_19,
+ js_var_20,
+ js_var_21
+ ],
+ "code" : js_var_22
+
+ };
+
+
+ }
+ );
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/language-frontend-modules/js/SwitchyardStatechartGenerator.js b/build/lib/commons-scxml-js/target/language-frontend-modules/js/SwitchyardStatechartGenerator.js
new file mode 100644
index 0000000..6d74a98
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/language-frontend-modules/js/SwitchyardStatechartGenerator.js
@@ -0,0 +1,110 @@
+
+
+ require.def(
+
+ "target/language-frontend-modules/js/SwitchyardStatechartGenerator",
+ [
+
+ "text!target/xsl/ir-compiler/normalizeInitialStates.xsl",
+
+ "text!target/xsl/ir-compiler/generateUniqueInitialStateIds.xsl",
+
+ "text!target/xsl/ir-compiler/generateUniqueStateIds.xsl",
+
+ "text!target/xsl/ir-compiler/positionTransitionsAfterSubstates.xsl",
+
+ "text!target/xsl/ir-compiler/transformIf.xsl",
+
+ "text!target/xsl/ir-compiler/addDefaultTransitionToHistoryStates.xsl",
+
+ "text!target/xsl/ir-compiler/appendBasicStateInformation.xsl",
+
+ "text!target/xsl/ir-compiler/appendStateInformation.xsl",
+
+ "text!target/xsl/ir-compiler/splitTransitionTargets.xsl",
+
+ "text!target/xsl/ir-compiler/changeTransitionsPointingToCompoundStatesToPointToInitialStates.xsl",
+
+ "text!target/xsl/ir-compiler/computeLCA.xsl",
+
+ "text!target/xsl/layout/addTransitionTargetIds.xsl",
+
+ "text!target/xsl/ir-compiler/addNearestParallelDescendantOfLCAToTransition.xsl",
+
+ "text!target/xsl/ir-compiler/flattenTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/nameTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/appendTransitionInformation.xsl",
+
+ "text!target/xsl/ir-compiler/copyEnumeratedEventTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/enumerateEvents.xsl",
+
+ "text!target/xsl/ir-compiler/numberStatesAndTransitions.xsl",
+
+ "text!target/xsl/ir-compiler/addEventRegularExpressions.xsl",
+
+ "text!target/xsl/ir-compiler/expandStarEvent.xsl",
+
+ "text!target/xsl/backends/js/SwitchyardStatechartGenerator.xsl"
+ ],
+
+ function(
+
+ js_var_1,
+ js_var_2,
+ js_var_3,
+ js_var_4,
+ js_var_5,
+ js_var_6,
+ js_var_7,
+ js_var_8,
+ js_var_9,
+ js_var_10,
+ js_var_11,
+ js_var_12,
+ js_var_13,
+ js_var_14,
+ js_var_15,
+ js_var_16,
+ js_var_17,
+ js_var_18,
+ js_var_19,
+ js_var_20,
+ js_var_21,
+ js_var_22
+ ){
+
+ return {
+ "transformations" : [
+ js_var_1,
+ js_var_2,
+ js_var_3,
+ js_var_4,
+ js_var_5,
+ js_var_6,
+ js_var_7,
+ js_var_8,
+ js_var_9,
+ js_var_10,
+ js_var_11,
+ js_var_12,
+ js_var_13,
+ js_var_14,
+ js_var_15,
+ js_var_16,
+ js_var_17,
+ js_var_18,
+ js_var_19,
+ js_var_20,
+ js_var_21
+ ],
+ "code" : js_var_22
+
+ };
+
+
+ }
+ );
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl-dep-list/StatePatternStatechartGenerator.xml b/build/lib/commons-scxml-js/target/xsl-dep-list/StatePatternStatechartGenerator.xml
new file mode 100644
index 0000000..fd1390d
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl-dep-list/StatePatternStatechartGenerator.xml
@@ -0,0 +1,21 @@
+
+
+
diff --git a/build/lib/commons-scxml-js/target/xsl-dep-list/StateTableStatechartGenerator.xml b/build/lib/commons-scxml-js/target/xsl-dep-list/StateTableStatechartGenerator.xml
new file mode 100644
index 0000000..ccd229e
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl-dep-list/StateTableStatechartGenerator.xml
@@ -0,0 +1,24 @@
+
+
+
diff --git a/build/lib/commons-scxml-js/target/xsl-dep-list/SwitchyardStatechartGenerator.xml b/build/lib/commons-scxml-js/target/xsl-dep-list/SwitchyardStatechartGenerator.xml
new file mode 100644
index 0000000..3efe717
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl-dep-list/SwitchyardStatechartGenerator.xml
@@ -0,0 +1,24 @@
+
+
+
diff --git a/build/lib/commons-scxml-js/target/xsl/backends/js/AbstractEnumeratedStatechartGenerator.xsl b/build/lib/commons-scxml-js/target/xsl/backends/js/AbstractEnumeratedStatechartGenerator.xsl
new file mode 100644
index 0000000..d24bee7
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/backends/js/AbstractEnumeratedStatechartGenerator.xsl
@@ -0,0 +1,1369 @@
+
+
+
+
+
+ if(
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ indexOf(
+
+
+
+
+ function indexOf(arr,obj){
+ for(var i=0, l=arr.length; i < l; i++){
+ if(arr[i]===obj){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+
+
+
+
+
+
+
+ function
+
+
+
+
+
+ //abstract state
+
+
+
+ //states
+
+
+
+
+
+
+
+
+ //trigger methods for synchronous interaction
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ var
+
+
+ : true
+ ,
+
+ }
+ ,
+
+ }
+
+ var
+
+
+ =
+
+ = xhrGET(
+
+
+ =
+
+ ,
+ ;
+
+
+ var
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+
+
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+ this.
+
+ this.$default = function(){};
+
+ this.$dispatchPrefixEvent = function(){};
+ }
+
+
+
+
+
+
+
+
+
+ true;
+
+
+ false;
+
+
+
+
+
+ this.ancestors = [
+
+
+ ,
+
+
+ ];
+
+
+
+
+
+ this.parent.historyState = this; //init parent's pointer to history state
+
+
+
+ this.parent.initial = this; //init parent's pointer to initial state
+
+
+ this.toString = function(){
+ return "
+ console.log("entering
+
+
+
+
+ //to
+ listener.onEntry("
+
+
+ }
+
+ this.exitAction = function(){
+
+ console.log("exiting
+
+
+ this.historyState.lastConfiguration = currentConfiguration.slice();
+
+
+
+
+
+ //from
+ listener.onExit("
+
+
+
+ }
+
+
+
+
+
+ }
+
+
+ ,
+
+ }
+
+
+ if (
+ else if (
+ else {
+
+
+ console.log( '
+
+ console.log(
+
+
+
+
+
+
+
+
+ //send delayed event
+
+
+
+
+ null
+
+
+ );
+ },
+
+
+ //send event
+ innerEventQueue.push(
+
+ ,
+
+
+
+
+ null
+
+ ,
+
+
+
+ window.clearTimeout(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function sortByDepthDeepToShallow(a,b){
+ return b.depth - a.depth;
+ }
+
+
+
+ ,data,
+
+ //static private member variables
+ var currentConfiguration = []; //current configuration
+ var innerEventQueue = []; //inner event queue
+ var outerEventQueue = []; //outer event queue
+ var isInStableState = true;
+ var hasTakenDefaultTransition = false;
+ var destroyed = false;
+ var mainLoopCallback = null;
+
+ //static private member functions
+ function mainLoop() {
+
+ if(!destroyed){
+ //take an event from the current outer event queue
+ if (outerEventQueue.length && isInStableState) {
+ runToCompletion(outerEventQueue.shift(),outerEventQueue.shift());
+ }
+ //call back
+ mainLoopCallback = window.setTimeout(function() {
+ mainLoop(); //FIXME: note that when calling mainloop this way, we won't have access to the "this" object.
+ //I don't think we ever use it though. Everything we need is private in function scope.
+ },
+ 100);
+ }
+ }
+
+ function runToCompletion(e,data,isEnumeratedEvent){
+ isInStableState = false;
+
+ if(e){
+ innerEventQueue.push(e,data,isEnumeratedEvent);
+ }
+
+ do{
+ //take any available default transitions
+ microstep(
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }else{
+ //e contains a dot, so dispatch as a prefix event
+
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }
+
+ //invoke selected transitions
+
+ t();
+
+
+ }
+
+ function mixin(from,to){
+ for(var prop in from){
+ to[prop] = from[prop]
+ }
+ }
+
+ this.destroy = function(){
+ //right now, this only disables timer and sets global destroyed variable to prevent future callbacks
+ window.clearTimeout(mainLoopCallback);
+ mainLoopCallback = null;
+ destroyed = true;
+ }
+
+
+ //this is for async communication
+ this.GEN = function(e,data){
+ outerEventQueue.push(e,data);
+ }
+
+ //this may or may not be something we want to expose, but for right now, we at least need it for testing
+ this.getCurrentConfiguration = function(){
+ //slice it to return a copy of the configuration rather than the conf itself
+ //this saves us all kinds of confusion involving references and stuff
+ //TODO: refactor this name to be genCurrentConfigurationStatement
+
+
+
+
+
+
+
+ //history state semantics
+ if(
+
+
+ console.log("return to last deep configuration");
+
+
+ console.log("return to last shallow configuration");
+
+
+
+
+
+
+
+
+
+ //transition id
+
+ l.onTransition(
+ "
+
+
+
+
+
+
+ var historyState =
+ var newConfiguration = [];
+
+
+
+
+
+
+ ,
+
+
+ ];
+
+
+
+ var historyStateParent =
+
+
+
+
+
+
+
+
+
+
+ !=-1
+
+
+
+
+
+ currentConfiguration =
+
+
+
+
+
+
+ == -1
+
+
+
+ newConfiguration = newConfiguration.concat(filteredConfiguration)
+
+
+
+
+ }
+ }
+
+
+ }else{
+
+
+ }
+
+
+
+
+ == -1
+
+
+ parent != historyState.parent
+
+ ;
+ parent = parent.parent){
+ statesEntered.push(parent);
+ }
+
+
+ var topState = statesEntered.pop();
+
+
+
+ topState.parent.enterAction();
+
+ topState.enterAction();
+
+
+
+
+ while(topState = statesEntered.pop()){
+ topState.enterAction();
+ }
+
+
+ newConfiguration.push(topState.initial ? topState.initial : topState );
+
+
+
+
+
+ do{
+ statesExited.push(state);
+ }while((state = state.parent) &&
+ state != lca &&
+
+ == -1)
+
+
+
+ !== -1
+
+
+
+ //sort by depth
+ statesExited.sort(sortByDepthDeepToShallow);
+
+ //execute actions for each of these states
+
+
+
+ state.exitAction();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {}
+
+
+
+ if(
+ return {
+ preemptedBasicStates :
+ hasTakenDefaultTransition = true;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //transition action
+
+
+
+
+ //transition id
+
+ listener.onTransition(
+ "
+
+
+
+
+
+
+ //enter states
+
+
+
+
+ //update configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+ function In(state){
+ state = typeof state == "string" ? self._states[state] : state;
+
+ var toReturn;
+
+ if(state.isBasic){
+ toReturn =
+ != -1;
+ }else{
+
+
+
+
+
+ != -1
+
+
+ }
+
+ return toReturn;
+ }
+
+ var listeners = [];
+ //TODO:listeners support adding listeners for a particular state
+ this.addListener = function(listener){
+ listeners.push(listener);
+ }
+
+ this.removeListener = function(listener){
+ listeners.splice(
+ ,1);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //enumeration of states int id's
+
+ var
+
+ //map from states int id's to objects
+ var STATE_INT_ID_TO_OBJECT_MAP = [
+
+ ,
+ ];
+
+ //tag each state object with an int id to map from object to id
+ //only needed for history
+
+
+
+ //enumeration of triggers
+
+ var
+
+ //expose them as a convenient interface as part of the API
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+
+
+
+
+
+ && ( ){
+
+ return
+ break;
+
+
+
+ this.TRIGGERS = {
+
+ ,
+
+ };
+
+
+
+
+ var TRIGGER_ID_TO_NAME_MAP = [
+
+ ' ,
+
+ ];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ ,
+
+ ];
+
+
+
+
+
+ ,1,
+
+ ,
+ );
+
+
+
+
+
+
+
+ ,1,
+
+ ,
+ );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/backends/js/AbstractStatechartGenerator.xsl b/build/lib/commons-scxml-js/target/xsl/backends/js/AbstractStatechartGenerator.xsl
new file mode 100644
index 0000000..38a4a21
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/backends/js/AbstractStatechartGenerator.xsl
@@ -0,0 +1,1253 @@
+
+
+
+
+ if(
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ indexOf(
+
+
+
+
+
+
+ function indexOf(arr,obj){
+ for(var i=0, l=arr.length; i < l; i++){
+ if(arr[i]===obj){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function
+
+
+
+
+
+ //abstract state
+
+
+
+ //states
+
+
+
+
+
+
+
+
+ //trigger methods for synchronous interaction
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+ var
+
+
+ : true
+ ,
+
+ }
+ ,
+
+ }
+
+
+
+ var
+
+
+ =
+
+ = xhrGET(
+
+
+ =
+
+ ,
+ ;
+
+
+
+
+
+ var
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+
+
+
+
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+
+
+ this.
+
+ this.$default = function(){};
+
+ this.$dispatchPrefixEvent = function(){};
+ }
+
+
+
+
+
+
+
+
+
+
+
+ true;
+
+
+ false;
+
+
+
+
+
+ this.ancestors = [
+
+
+ ,
+
+
+ ];
+
+
+
+
+
+ this.parent.historyState = this; //init parent's pointer to history state
+
+
+
+ this.parent.initial = this; //init parent's pointer to initial state
+
+
+ this.toString = function(){
+ return "
+ console.log("entering
+
+
+
+
+ //to
+ listener.onEntry("
+
+
+ }
+
+ this.exitAction = function(){
+
+ console.log("exiting
+
+
+ this.historyState.lastConfiguration = currentConfiguration.slice();
+
+
+
+
+
+ //from
+ listener.onExit("
+
+
+
+ }
+
+
+
+
+
+ }
+
+
+
+
+
+ ,
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+ if (
+
+
+ else if (
+
+
+ else {
+
+
+
+
+ console.log( '
+
+ console.log(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //send delayed event
+
+
+
+
+ null
+
+
+ );
+ },
+
+
+ //send event
+ innerEventQueue.push(
+
+ ,
+
+
+
+
+ null
+
+ ,
+
+
+
+
+
+ window.clearTimeout(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function sortByDepthDeepToShallow(a,b){
+ return b.depth - a.depth;
+ }
+
+
+
+
+
+ ,data,
+
+
+
+ //static private member variables
+ var currentConfiguration = []; //current configuration
+ var innerEventQueue = []; //inner event queue
+ var outerEventQueue = []; //outer event queue
+ var isInStableState = true;
+ var hasTakenDefaultTransition = false;
+ var destroyed = false;
+ var mainLoopCallback = null;
+
+ //static private member functions
+ function mainLoop() {
+
+ if(!destroyed){
+ //take an event from the current outer event queue
+ if (outerEventQueue.length && isInStableState) {
+ runToCompletion(outerEventQueue.shift(),outerEventQueue.shift());
+ }
+ //call back
+ mainLoopCallback = window.setTimeout(function() {
+ mainLoop(); //FIXME: note that when calling mainloop this way, we won't have access to the "this" object.
+ //I don't think we ever use it though. Everything we need is private in function scope.
+ },
+ 100);
+ }
+ }
+
+ function runToCompletion(e,data,isEnumeratedEvent){
+ isInStableState = false;
+
+ if(e){
+ innerEventQueue.push(e,data,isEnumeratedEvent);
+ }
+
+ do{
+ //take any available default transitions
+ microstep(
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }else{
+ //e contains a dot, so dispatch as a prefix event
+
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }
+
+ //invoke selected transitions
+
+ t();
+
+
+ }
+
+ function mixin(from,to){
+ for(var prop in from){
+ to[prop] = from[prop]
+ }
+ }
+
+ this.destroy = function(){
+ //right now, this only disables timer and sets global destroyed variable to prevent future callbacks
+ window.clearTimeout(mainLoopCallback);
+ mainLoopCallback = null;
+ destroyed = true;
+ }
+
+
+ //this is for async communication
+ this.GEN = function(e,data){
+ outerEventQueue.push(e,data);
+ }
+
+ //this may or may not be something we want to expose, but for right now, we at least need it for testing
+ this.getCurrentConfiguration = function(){
+ //slice it to return a copy of the configuration rather than the conf itself
+ //this saves us all kinds of confusion involving references and stuff
+ //TODO: refactor this name to be genCurrentConfigurationStatement
+
+
+
+
+
+
+
+
+
+ //history state semantics
+ if(
+
+
+ console.log("return to last deep configuration");
+
+
+ console.log("return to last shallow configuration");
+
+
+
+
+
+
+
+
+
+ //transition id
+
+ l.onTransition(
+ "
+
+
+
+
+
+
+ var historyState =
+ var newConfiguration = [];
+
+
+
+
+
+
+ ,
+
+
+ ];
+
+
+
+ var historyStateParent =
+
+
+
+
+
+
+
+
+
+
+ !=-1
+
+
+
+
+
+ currentConfiguration =
+
+
+
+
+
+
+ == -1
+
+
+
+ newConfiguration = newConfiguration.concat(filteredConfiguration)
+
+
+
+
+ }
+ }
+
+
+ }else{
+
+
+ }
+
+
+
+
+
+
+ == -1
+
+
+ parent != historyState.parent
+
+ ;
+ parent = parent.parent){
+ statesEntered.push(parent);
+ }
+
+
+ var topState = statesEntered.pop();
+
+
+
+ topState.parent.enterAction();
+
+ topState.enterAction();
+
+
+
+
+ while(topState = statesEntered.pop()){
+ topState.enterAction();
+ }
+
+
+ newConfiguration.push(topState.initial ? topState.initial : topState );
+
+
+
+
+
+
+
+ do{
+ statesExited.push(state);
+ }while((state = state.parent) &&
+ state != lca &&
+
+ == -1)
+
+
+
+ !== -1
+
+
+
+ //sort by depth
+ statesExited.sort(sortByDepthDeepToShallow);
+
+ //execute actions for each of these states
+
+
+
+ state.exitAction();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {}
+
+
+
+
+
+ if(
+ return {
+ preemptedBasicStates :
+ hasTakenDefaultTransition = true;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //transition action
+
+
+
+
+ //transition id
+
+ listener.onTransition(
+ "
+
+
+
+
+
+
+ //enter states
+
+
+
+
+ //update configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+
+
+ function In(state){
+ state = typeof state == "string" ? self._states[state] : state;
+
+ var toReturn;
+
+ if(state.isBasic){
+ toReturn =
+ != -1;
+ }else{
+
+
+
+
+
+ != -1
+
+
+ }
+
+ return toReturn;
+ }
+
+
+
+ var listeners = [];
+ //TODO:listeners support adding listeners for a particular state
+ this.addListener = function(listener){
+ listeners.push(listener);
+ }
+
+ this.removeListener = function(listener){
+ listeners.splice(
+ ,1);
+ }
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/backends/js/StatePatternStatechartGenerator.xsl b/build/lib/commons-scxml-js/target/xsl/backends/js/StatePatternStatechartGenerator.xsl
new file mode 100644
index 0000000..99aad77
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/backends/js/StatePatternStatechartGenerator.xsl
@@ -0,0 +1,1280 @@
+
+
+
+
+
+ if(
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ indexOf(
+
+
+
+
+ function indexOf(arr,obj){
+ for(var i=0, l=arr.length; i < l; i++){
+ if(arr[i]===obj){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+
+
+
+
+
+
+
+ function
+
+
+
+
+
+ //abstract state
+
+
+
+ //states
+
+
+
+
+
+
+
+
+ //trigger methods for synchronous interaction
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ var
+
+
+ : true
+ ,
+
+ }
+ ,
+
+ }
+
+ var
+
+
+ =
+
+ = xhrGET(
+
+
+ =
+
+ ,
+ ;
+
+
+ var
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+
+
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+ this.
+
+ this.$default = function(){};
+
+ this.$dispatchPrefixEvent = function(){};
+ }
+
+
+
+
+
+
+
+
+
+ true;
+
+
+ false;
+
+
+
+
+
+ this.ancestors = [
+
+
+ ,
+
+
+ ];
+
+
+
+
+
+ this.parent.historyState = this; //init parent's pointer to history state
+
+
+
+ this.parent.initial = this; //init parent's pointer to initial state
+
+
+ this.toString = function(){
+ return "
+ console.log("entering
+
+
+
+
+ //to
+ listener.onEntry("
+
+
+ }
+
+ this.exitAction = function(){
+
+ console.log("exiting
+
+
+ this.historyState.lastConfiguration = currentConfiguration.slice();
+
+
+
+
+
+ //from
+ listener.onExit("
+
+
+
+ }
+
+
+
+
+
+ }
+
+
+ ,
+
+ }
+
+
+ if (
+ else if (
+ else {
+
+
+ console.log( '
+
+ console.log(
+
+
+
+
+
+
+
+
+ //send delayed event
+
+
+
+
+ null
+
+
+ );
+ },
+
+
+ //send event
+ innerEventQueue.push(
+
+ ,
+
+
+
+
+ null
+
+ ,
+
+
+
+ window.clearTimeout(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function sortByDepthDeepToShallow(a,b){
+ return b.depth - a.depth;
+ }
+
+
+
+ ,data,
+
+ //static private member variables
+ var currentConfiguration = []; //current configuration
+ var innerEventQueue = []; //inner event queue
+ var outerEventQueue = []; //outer event queue
+ var isInStableState = true;
+ var hasTakenDefaultTransition = false;
+ var destroyed = false;
+ var mainLoopCallback = null;
+
+ //static private member functions
+ function mainLoop() {
+
+ if(!destroyed){
+ //take an event from the current outer event queue
+ if (outerEventQueue.length && isInStableState) {
+ runToCompletion(outerEventQueue.shift(),outerEventQueue.shift());
+ }
+ //call back
+ mainLoopCallback = window.setTimeout(function() {
+ mainLoop(); //FIXME: note that when calling mainloop this way, we won't have access to the "this" object.
+ //I don't think we ever use it though. Everything we need is private in function scope.
+ },
+ 100);
+ }
+ }
+
+ function runToCompletion(e,data,isEnumeratedEvent){
+ isInStableState = false;
+
+ if(e){
+ innerEventQueue.push(e,data,isEnumeratedEvent);
+ }
+
+ do{
+ //take any available default transitions
+ microstep(
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }else{
+ //e contains a dot, so dispatch as a prefix event
+
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }
+
+ //invoke selected transitions
+
+ t();
+
+
+ }
+
+ function mixin(from,to){
+ for(var prop in from){
+ to[prop] = from[prop]
+ }
+ }
+
+ this.destroy = function(){
+ //right now, this only disables timer and sets global destroyed variable to prevent future callbacks
+ window.clearTimeout(mainLoopCallback);
+ mainLoopCallback = null;
+ destroyed = true;
+ }
+
+
+ //this is for async communication
+ this.GEN = function(e,data){
+ outerEventQueue.push(e,data);
+ }
+
+ //this may or may not be something we want to expose, but for right now, we at least need it for testing
+ this.getCurrentConfiguration = function(){
+ //slice it to return a copy of the configuration rather than the conf itself
+ //this saves us all kinds of confusion involving references and stuff
+ //TODO: refactor this name to be genCurrentConfigurationStatement
+
+
+
+
+
+
+
+ //history state semantics
+ if(
+
+
+ console.log("return to last deep configuration");
+
+
+ console.log("return to last shallow configuration");
+
+
+
+
+
+
+
+
+
+ //transition id
+
+ l.onTransition(
+ "
+
+
+
+
+
+
+ var historyState =
+ var newConfiguration = [];
+
+
+
+
+
+
+ ,
+
+
+ ];
+
+
+
+ var historyStateParent =
+
+
+
+
+
+
+
+
+
+
+ !=-1
+
+
+
+
+
+ currentConfiguration =
+
+
+
+
+
+
+ == -1
+
+
+
+ newConfiguration = newConfiguration.concat(filteredConfiguration)
+
+
+
+
+ }
+ }
+
+
+ }else{
+
+
+ }
+
+
+
+
+ == -1
+
+
+ parent != historyState.parent
+
+ ;
+ parent = parent.parent){
+ statesEntered.push(parent);
+ }
+
+
+ var topState = statesEntered.pop();
+
+
+
+ topState.parent.enterAction();
+
+ topState.enterAction();
+
+
+
+
+ while(topState = statesEntered.pop()){
+ topState.enterAction();
+ }
+
+
+ newConfiguration.push(topState.initial ? topState.initial : topState );
+
+
+
+
+
+ do{
+ statesExited.push(state);
+ }while((state = state.parent) &&
+ state != lca &&
+
+ == -1)
+
+
+
+ !== -1
+
+
+
+ //sort by depth
+ statesExited.sort(sortByDepthDeepToShallow);
+
+ //execute actions for each of these states
+
+
+
+ state.exitAction();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {}
+
+
+
+ if(
+ return {
+ preemptedBasicStates :
+ hasTakenDefaultTransition = true;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //transition action
+
+
+
+
+ //transition id
+
+ listener.onTransition(
+ "
+
+
+
+
+
+
+ //enter states
+
+
+
+
+ //update configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+ function In(state){
+ state = typeof state == "string" ? self._states[state] : state;
+
+ var toReturn;
+
+ if(state.isBasic){
+ toReturn =
+ != -1;
+ }else{
+
+
+
+
+
+ != -1
+
+
+ }
+
+ return toReturn;
+ }
+
+ var listeners = [];
+ //TODO:listeners support adding listeners for a particular state
+ this.addListener = function(listener){
+ listeners.push(listener);
+ }
+
+ this.removeListener = function(listener){
+ listeners.splice(
+ ,1);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ this.$dispatchPrefixEvent = function(e){
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+ return
+
+
+
+
+ ,1,
+
+ ,
+
+ );
+
+
+
+
+
+ ,1,
+
+ ,
+
+ );
+
+
+
+
+ ,
+
+ ];
+
+
+
+
+
+
+
+ this.initialize = function(){
+ currentConfiguration = [
+
+
+
+
+
+
+
+
+
+
+
+ return
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/backends/js/StateTableStatechartGenerator.xsl b/build/lib/commons-scxml-js/target/xsl/backends/js/StateTableStatechartGenerator.xsl
new file mode 100644
index 0000000..205e4b4
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/backends/js/StateTableStatechartGenerator.xsl
@@ -0,0 +1,1414 @@
+
+
+
+
+
+ if(
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ indexOf(
+
+
+
+
+ function indexOf(arr,obj){
+ for(var i=0, l=arr.length; i < l; i++){
+ if(arr[i]===obj){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+
+
+
+
+
+
+
+ function
+
+
+
+
+
+ //abstract state
+
+
+
+ //states
+
+
+
+
+
+
+
+
+ //trigger methods for synchronous interaction
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ var
+
+
+ : true
+ ,
+
+ }
+ ,
+
+ }
+
+ var
+
+
+ =
+
+ = xhrGET(
+
+
+ =
+
+ ,
+ ;
+
+
+ var
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+
+
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+ this.
+
+ this.$default = function(){};
+
+ this.$dispatchPrefixEvent = function(){};
+ }
+
+
+
+
+
+
+
+
+
+ true;
+
+
+ false;
+
+
+
+
+
+ this.ancestors = [
+
+
+ ,
+
+
+ ];
+
+
+
+
+
+ this.parent.historyState = this; //init parent's pointer to history state
+
+
+
+ this.parent.initial = this; //init parent's pointer to initial state
+
+
+ this.toString = function(){
+ return "
+ console.log("entering
+
+
+
+
+ //to
+ listener.onEntry("
+
+
+ }
+
+ this.exitAction = function(){
+
+ console.log("exiting
+
+
+ this.historyState.lastConfiguration = currentConfiguration.slice();
+
+
+
+
+
+ //from
+ listener.onExit("
+
+
+
+ }
+
+
+
+
+
+ }
+
+
+ ,
+
+ }
+
+
+ if (
+ else if (
+ else {
+
+
+ console.log( '
+
+ console.log(
+
+
+
+
+
+
+
+
+ //send delayed event
+
+
+
+
+ null
+
+
+ );
+ },
+
+
+ //send event
+ innerEventQueue.push(
+
+ ,
+
+
+
+
+ null
+
+ ,
+
+
+
+ window.clearTimeout(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function sortByDepthDeepToShallow(a,b){
+ return b.depth - a.depth;
+ }
+
+
+
+ ,data,
+
+ //static private member variables
+ var currentConfiguration = []; //current configuration
+ var innerEventQueue = []; //inner event queue
+ var outerEventQueue = []; //outer event queue
+ var isInStableState = true;
+ var hasTakenDefaultTransition = false;
+ var destroyed = false;
+ var mainLoopCallback = null;
+
+ //static private member functions
+ function mainLoop() {
+
+ if(!destroyed){
+ //take an event from the current outer event queue
+ if (outerEventQueue.length && isInStableState) {
+ runToCompletion(outerEventQueue.shift(),outerEventQueue.shift());
+ }
+ //call back
+ mainLoopCallback = window.setTimeout(function() {
+ mainLoop(); //FIXME: note that when calling mainloop this way, we won't have access to the "this" object.
+ //I don't think we ever use it though. Everything we need is private in function scope.
+ },
+ 100);
+ }
+ }
+
+ function runToCompletion(e,data,isEnumeratedEvent){
+ isInStableState = false;
+
+ if(e){
+ innerEventQueue.push(e,data,isEnumeratedEvent);
+ }
+
+ do{
+ //take any available default transitions
+ microstep(
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }else{
+ //e contains a dot, so dispatch as a prefix event
+
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }
+
+ //invoke selected transitions
+
+ t();
+
+
+ }
+
+ function mixin(from,to){
+ for(var prop in from){
+ to[prop] = from[prop]
+ }
+ }
+
+ this.destroy = function(){
+ //right now, this only disables timer and sets global destroyed variable to prevent future callbacks
+ window.clearTimeout(mainLoopCallback);
+ mainLoopCallback = null;
+ destroyed = true;
+ }
+
+
+ //this is for async communication
+ this.GEN = function(e,data){
+ outerEventQueue.push(e,data);
+ }
+
+ //this may or may not be something we want to expose, but for right now, we at least need it for testing
+ this.getCurrentConfiguration = function(){
+ //slice it to return a copy of the configuration rather than the conf itself
+ //this saves us all kinds of confusion involving references and stuff
+ //TODO: refactor this name to be genCurrentConfigurationStatement
+
+
+
+
+
+
+
+ //history state semantics
+ if(
+
+
+ console.log("return to last deep configuration");
+
+
+ console.log("return to last shallow configuration");
+
+
+
+
+
+
+
+
+
+ //transition id
+
+ l.onTransition(
+ "
+
+
+
+
+
+
+ var historyState =
+ var newConfiguration = [];
+
+
+
+
+
+
+ ,
+
+
+ ];
+
+
+
+ var historyStateParent =
+
+
+
+
+
+
+
+
+
+
+ !=-1
+
+
+
+
+
+ currentConfiguration =
+
+
+
+
+
+
+ == -1
+
+
+
+ newConfiguration = newConfiguration.concat(filteredConfiguration)
+
+
+
+
+ }
+ }
+
+
+ }else{
+
+
+ }
+
+
+
+
+ == -1
+
+
+ parent != historyState.parent
+
+ ;
+ parent = parent.parent){
+ statesEntered.push(parent);
+ }
+
+
+ var topState = statesEntered.pop();
+
+
+
+ topState.parent.enterAction();
+
+ topState.enterAction();
+
+
+
+
+ while(topState = statesEntered.pop()){
+ topState.enterAction();
+ }
+
+
+ newConfiguration.push(topState.initial ? topState.initial : topState );
+
+
+
+
+
+ do{
+ statesExited.push(state);
+ }while((state = state.parent) &&
+ state != lca &&
+
+ == -1)
+
+
+
+ !== -1
+
+
+
+ //sort by depth
+ statesExited.sort(sortByDepthDeepToShallow);
+
+ //execute actions for each of these states
+
+
+
+ state.exitAction();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {}
+
+
+
+ if(
+ return {
+ preemptedBasicStates :
+ hasTakenDefaultTransition = true;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //transition action
+
+
+
+
+ //transition id
+
+ listener.onTransition(
+ "
+
+
+
+
+
+
+ //enter states
+
+
+
+
+ //update configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+ function In(state){
+ state = typeof state == "string" ? self._states[state] : state;
+
+ var toReturn;
+
+ if(state.isBasic){
+ toReturn =
+ != -1;
+ }else{
+
+
+
+
+
+ != -1
+
+
+ }
+
+ return toReturn;
+ }
+
+ var listeners = [];
+ //TODO:listeners support adding listeners for a particular state
+ this.addListener = function(listener){
+ listeners.push(listener);
+ }
+
+ this.removeListener = function(listener){
+ listeners.splice(
+ ,1);
+ }
+
+
+
+
+
+
+
+
+
+
+ //enumeration of states int id's
+
+ var
+
+ //map from states int id's to objects
+ var STATE_INT_ID_TO_OBJECT_MAP = [
+
+ ,
+ ];
+
+ //tag each state object with an int id to map from object to id
+ //only needed for history
+
+
+
+ //enumeration of triggers
+
+ var
+
+ //expose them as a convenient interface as part of the API
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+
+
+
+ && ( ){
+
+ return
+ break;
+
+ this.TRIGGERS = {
+
+ ,
+
+ };
+
+ var TRIGGER_ID_TO_NAME_MAP = [
+
+ ' ,
+
+ ];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ ,
+
+ ];
+
+
+
+ ,1,
+
+ ,
+ );
+
+
+
+
+ ,1,
+
+ ,
+ );
+
+
+
+
+
+
+
+
+ "
+
+
+
+
+
+
+
+
+
+
+ var
+
+
+
+
+ var STATE_TRANSITION_TABLE = [
+
+
+ [
+
+
+
+
+
+
+
+
+
+
+ ,
+
+
+ ]
+
+ ,
+
+
+
+ ]
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/backends/js/SwitchyardStatechartGenerator.xsl b/build/lib/commons-scxml-js/target/xsl/backends/js/SwitchyardStatechartGenerator.xsl
new file mode 100644
index 0000000..b865423
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/backends/js/SwitchyardStatechartGenerator.xsl
@@ -0,0 +1,1397 @@
+
+
+
+
+
+ if(
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ indexOf(
+
+
+
+
+ function indexOf(arr,obj){
+ for(var i=0, l=arr.length; i < l; i++){
+ if(arr[i]===obj){
+ return i;
+ }
+ }
+ return -1;
+ }
+
+
+
+
+
+
+
+
+
+ function
+
+
+
+
+
+ //abstract state
+
+
+
+ //states
+
+
+
+
+
+
+
+
+ //trigger methods for synchronous interaction
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ var
+
+
+ : true
+ ,
+
+ }
+ ,
+
+ }
+
+ var
+
+
+ =
+
+ = xhrGET(
+
+
+ =
+
+ ,
+ ;
+
+
+ var
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+
+
+
+
+ ;
+
+
+ ,
+
+
+
+
+
+ this.
+
+ this.$default = function(){};
+
+ this.$dispatchPrefixEvent = function(){};
+ }
+
+
+
+
+
+
+
+
+
+ true;
+
+
+ false;
+
+
+
+
+
+ this.ancestors = [
+
+
+ ,
+
+
+ ];
+
+
+
+
+
+ this.parent.historyState = this; //init parent's pointer to history state
+
+
+
+ this.parent.initial = this; //init parent's pointer to initial state
+
+
+ this.toString = function(){
+ return "
+ console.log("entering
+
+
+
+
+ //to
+ listener.onEntry("
+
+
+ }
+
+ this.exitAction = function(){
+
+ console.log("exiting
+
+
+ this.historyState.lastConfiguration = currentConfiguration.slice();
+
+
+
+
+
+ //from
+ listener.onExit("
+
+
+
+ }
+
+
+
+
+
+ }
+
+
+ ,
+
+ }
+
+
+ if (
+ else if (
+ else {
+
+
+ console.log( '
+
+ console.log(
+
+
+
+
+
+
+
+
+ //send delayed event
+
+
+
+
+ null
+
+
+ );
+ },
+
+
+ //send event
+ innerEventQueue.push(
+
+ ,
+
+
+
+
+ null
+
+ ,
+
+
+
+ window.clearTimeout(
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ function sortByDepthDeepToShallow(a,b){
+ return b.depth - a.depth;
+ }
+
+
+
+ ,data,
+
+ //static private member variables
+ var currentConfiguration = []; //current configuration
+ var innerEventQueue = []; //inner event queue
+ var outerEventQueue = []; //outer event queue
+ var isInStableState = true;
+ var hasTakenDefaultTransition = false;
+ var destroyed = false;
+ var mainLoopCallback = null;
+
+ //static private member functions
+ function mainLoop() {
+
+ if(!destroyed){
+ //take an event from the current outer event queue
+ if (outerEventQueue.length && isInStableState) {
+ runToCompletion(outerEventQueue.shift(),outerEventQueue.shift());
+ }
+ //call back
+ mainLoopCallback = window.setTimeout(function() {
+ mainLoop(); //FIXME: note that when calling mainloop this way, we won't have access to the "this" object.
+ //I don't think we ever use it though. Everything we need is private in function scope.
+ },
+ 100);
+ }
+ }
+
+ function runToCompletion(e,data,isEnumeratedEvent){
+ isInStableState = false;
+
+ if(e){
+ innerEventQueue.push(e,data,isEnumeratedEvent);
+ }
+
+ do{
+ //take any available default transitions
+ microstep(
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }else{
+ //e contains a dot, so dispatch as a prefix event
+
+
+
+ //check to make sure he is not preempted
+ if(!(state in preemptedBasicStates)){
+ //lookup the transition
+ var transition =
+
+ }
+
+ //invoke selected transitions
+
+ t();
+
+
+ }
+
+ function mixin(from,to){
+ for(var prop in from){
+ to[prop] = from[prop]
+ }
+ }
+
+ this.destroy = function(){
+ //right now, this only disables timer and sets global destroyed variable to prevent future callbacks
+ window.clearTimeout(mainLoopCallback);
+ mainLoopCallback = null;
+ destroyed = true;
+ }
+
+
+ //this is for async communication
+ this.GEN = function(e,data){
+ outerEventQueue.push(e,data);
+ }
+
+ //this may or may not be something we want to expose, but for right now, we at least need it for testing
+ this.getCurrentConfiguration = function(){
+ //slice it to return a copy of the configuration rather than the conf itself
+ //this saves us all kinds of confusion involving references and stuff
+ //TODO: refactor this name to be genCurrentConfigurationStatement
+
+
+
+
+
+
+
+ //history state semantics
+ if(
+
+
+ console.log("return to last deep configuration");
+
+
+ console.log("return to last shallow configuration");
+
+
+
+
+
+
+
+
+
+ //transition id
+
+ l.onTransition(
+ "
+
+
+
+
+
+
+ var historyState =
+ var newConfiguration = [];
+
+
+
+
+
+
+ ,
+
+
+ ];
+
+
+
+ var historyStateParent =
+
+
+
+
+
+
+
+
+
+
+ !=-1
+
+
+
+
+
+ currentConfiguration =
+
+
+
+
+
+
+ == -1
+
+
+
+ newConfiguration = newConfiguration.concat(filteredConfiguration)
+
+
+
+
+ }
+ }
+
+
+ }else{
+
+
+ }
+
+
+
+
+ == -1
+
+
+ parent != historyState.parent
+
+ ;
+ parent = parent.parent){
+ statesEntered.push(parent);
+ }
+
+
+ var topState = statesEntered.pop();
+
+
+
+ topState.parent.enterAction();
+
+ topState.enterAction();
+
+
+
+
+ while(topState = statesEntered.pop()){
+ topState.enterAction();
+ }
+
+
+ newConfiguration.push(topState.initial ? topState.initial : topState );
+
+
+
+
+
+ do{
+ statesExited.push(state);
+ }while((state = state.parent) &&
+ state != lca &&
+
+ == -1)
+
+
+
+ !== -1
+
+
+
+ //sort by depth
+ statesExited.sort(sortByDepthDeepToShallow);
+
+ //execute actions for each of these states
+
+
+
+ state.exitAction();
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {}
+
+
+
+ if(
+ return {
+ preemptedBasicStates :
+ hasTakenDefaultTransition = true;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ //transition action
+
+
+
+
+ //transition id
+
+ listener.onTransition(
+ "
+
+
+
+
+
+
+ //enter states
+
+
+
+
+ //update configuration
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+ function In(state){
+ state = typeof state == "string" ? self._states[state] : state;
+
+ var toReturn;
+
+ if(state.isBasic){
+ toReturn =
+ != -1;
+ }else{
+
+
+
+
+
+ != -1
+
+
+ }
+
+ return toReturn;
+ }
+
+ var listeners = [];
+ //TODO:listeners support adding listeners for a particular state
+ this.addListener = function(listener){
+ listeners.push(listener);
+ }
+
+ this.removeListener = function(listener){
+ listeners.splice(
+ ,1);
+ }
+
+
+
+
+
+
+
+
+
+
+ //enumeration of states int id's
+
+ var
+
+ //map from states int id's to objects
+ var STATE_INT_ID_TO_OBJECT_MAP = [
+
+ ,
+ ];
+
+ //tag each state object with an int id to map from object to id
+ //only needed for history
+
+
+
+ //enumeration of triggers
+
+ var
+
+ //expose them as a convenient interface as part of the API
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+
+
+
+ && ( ){
+
+ return
+ break;
+
+ this.TRIGGERS = {
+
+ ,
+
+ };
+
+ var TRIGGER_ID_TO_NAME_MAP = [
+
+ ' ,
+
+ ];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+ ,
+
+ ];
+
+
+
+ ,1,
+
+ ,
+ );
+
+
+
+
+ ,1,
+
+ ,
+ );
+
+
+
+
+
+
+
+
+ "
+
+
+
+
+
+
+
+
+
+ //state transition table
+
+
+
+
+
+
+
+
+
+ }
+ }
+
+
+
+
+
+
+
+
+ }
+ break;
+
+
+
+
+
+
+
+
+
+
+
+
+ case
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/addDefaultTransitionToHistoryStates.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/addDefaultTransitionToHistoryStates.xsl
new file mode 100644
index 0000000..a18d970
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/addDefaultTransitionToHistoryStates.xsl
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/addEventRegularExpressions.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/addEventRegularExpressions.xsl
new file mode 100644
index 0000000..f033558
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/addEventRegularExpressions.xsl
@@ -0,0 +1,142 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ \.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _
+
+
+
+
+
+
+
+
+
+
+
+
+ /^(
+
+
+ )/
+
+
+
+
+
+
+
+ star
+
+
+
+
+
+
+
+
+
+
+ /.*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/addNearestParallelDescendantOfLCAToTransition.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/addNearestParallelDescendantOfLCAToTransition.xsl
new file mode 100644
index 0000000..4f607f0
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/addNearestParallelDescendantOfLCAToTransition.xsl
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendBasicStateInformation.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendBasicStateInformation.xsl
new file mode 100644
index 0000000..5c1a246
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendBasicStateInformation.xsl
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendStateInformation.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendStateInformation.xsl
new file mode 100644
index 0000000..5428e2f
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendStateInformation.xsl
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendTransitionInformation.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendTransitionInformation.xsl
new file mode 100644
index 0000000..059586e
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/appendTransitionInformation.xsl
@@ -0,0 +1,112 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/changeTransitionsPointingToCompoundStatesToPointToInitialStates.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/changeTransitionsPointingToCompoundStatesToPointToInitialStates.xsl
new file mode 100644
index 0000000..e0738d3
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/changeTransitionsPointingToCompoundStatesToPointToInitialStates.xsl
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/computeLCA.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/computeLCA.xsl
new file mode 100644
index 0000000..0da180d
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/computeLCA.xsl
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Error compiling statechart: target state does not have id, for source state with id:
+
+
+
+ Error compiling statechart: Could not find targe state with id
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/copyEnumeratedEventTransitions.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/copyEnumeratedEventTransitions.xsl
new file mode 100644
index 0000000..2485e4b
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/copyEnumeratedEventTransitions.xsl
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/enumerateEvents.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/enumerateEvents.xsl
new file mode 100644
index 0000000..aab2ee4
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/enumerateEvents.xsl
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/expandStarEvent.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/expandStarEvent.xsl
new file mode 100644
index 0000000..9d3b9d9
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/expandStarEvent.xsl
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/flattenTransitions.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/flattenTransitions.xsl
new file mode 100644
index 0000000..a6245d4
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/flattenTransitions.xsl
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/generateUniqueInitialStateIds.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/generateUniqueInitialStateIds.xsl
new file mode 100644
index 0000000..6520186
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/generateUniqueInitialStateIds.xsl
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/generateUniqueStateIds.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/generateUniqueStateIds.xsl
new file mode 100644
index 0000000..9536ff1
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/generateUniqueStateIds.xsl
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/nameTransitions.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/nameTransitions.xsl
new file mode 100644
index 0000000..cb37447
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/nameTransitions.xsl
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ _
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/normalizeInitialStates.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/normalizeInitialStates.xsl
new file mode 100644
index 0000000..e2c8705
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/normalizeInitialStates.xsl
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/numberStatesAndTransitions.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/numberStatesAndTransitions.xsl
new file mode 100644
index 0000000..bb7d0ac
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/numberStatesAndTransitions.xsl
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/positionTransitionsAfterSubstates.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/positionTransitionsAfterSubstates.xsl
new file mode 100644
index 0000000..66a6fc7
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/positionTransitionsAfterSubstates.xsl
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/splitTransitionTargets.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/splitTransitionTargets.xsl
new file mode 100644
index 0000000..4d7c331
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/splitTransitionTargets.xsl
@@ -0,0 +1,56 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/ir-compiler/transformIf.xsl b/build/lib/commons-scxml-js/target/xsl/ir-compiler/transformIf.xsl
new file mode 100644
index 0000000..2011bd8
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/ir-compiler/transformIf.xsl
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/layout/addTransitionTargetIds.xsl b/build/lib/commons-scxml-js/target/xsl/layout/addTransitionTargetIds.xsl
new file mode 100644
index 0000000..1093a8b
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/layout/addTransitionTargetIds.xsl
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/layout/computeAncestorOrSelfAndChildOfLCA.xsl b/build/lib/commons-scxml-js/target/xsl/layout/computeAncestorOrSelfAndChildOfLCA.xsl
new file mode 100644
index 0000000..45b3ad9
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/layout/computeAncestorOrSelfAndChildOfLCA.xsl
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/layout/scxmlToSVG.xsl b/build/lib/commons-scxml-js/target/xsl/layout/scxmlToSVG.xsl
new file mode 100644
index 0000000..05586ba
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/layout/scxmlToSVG.xsl
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [
+ ]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ H*
+
+
+ H
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/js-from-topo-sort-list-generator.xsl b/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/js-from-topo-sort-list-generator.xsl
new file mode 100644
index 0000000..92c3121
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/js-from-topo-sort-list-generator.xsl
@@ -0,0 +1,43 @@
+
+
+
+ require.def(
+
+ "
+ "text!
+ "text!
+
+
+ ,
+
+
+ ],
+ "code" :
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/py-from-topo-sort-list-generator.xsl b/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/py-from-topo-sort-list-generator.xsl
new file mode 100644
index 0000000..c1fd633
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/py-from-topo-sort-list-generator.xsl
@@ -0,0 +1,22 @@
+
+
+
+config = {
+ "transformations": [
+
+
+ " " ,
+
+ ],
+ "code" : " "
+}
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl b/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl
new file mode 100644
index 0000000..268a72f
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/util/language-frontend-module-generators/sh-from-topo-sort-list-generator.xsl
@@ -0,0 +1,17 @@
+
+
+ cat $1 |
+
+ xsltproc - | \
+
+
+ xsltproc -
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/util/preprocess_import.xsl b/build/lib/commons-scxml-js/target/xsl/util/preprocess_import.xsl
new file mode 100644
index 0000000..1cd8ec9
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/util/preprocess_import.xsl
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/util/scxml-to-dot.xsl b/build/lib/commons-scxml-js/target/xsl/util/scxml-to-dot.xsl
new file mode 100644
index 0000000..8724a83
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/util/scxml-to-dot.xsl
@@ -0,0 +1,278 @@
+
+
+
+
+
+
+
+ 3
+
+
+ 2
+
+
+ 1
+
+
+
+
+ label=<<TABLE>
+
+ <TR>
+ <TD colspan=" ">
+ </TD>
+ </TR>
+
+
+ <TR>
+ <TD>
+ </TD>
+
+ <TD>
+
+
+ </TD>
+
+
+ <TD>
+ </TD>
+
+ </TR>
+
+ </TABLE>>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ subgraph cluster_
+
+ color="blue";
+
+
+ color="black";
+
+
+
+
+ style="rounded,
+
+
+ dashed
+
+
+ solid
+
+
+ ";
+
+
+
+
+ label="
+ _static_reactions
+ [
+
+
+ shape=none];
+
+
+ }
+
+
+ [shape=box, style="rounded"];
+
+
+
+
+
+ [shape=box, style="rounded,filled",fillcolor=gray];
+
+
+
+ [shape=point,width=.15];
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ltail=cluster_
+
+ lhead=cluster_
+
+
+
+
+
+
+
+
+ label="
+
+ [
+ ]
+
+
+ /
+
+
+
+ "
+
+
+
+ ];
+
+
+
\ No newline at end of file
diff --git a/build/lib/commons-scxml-js/target/xsl/util/topo-sort.xsl b/build/lib/commons-scxml-js/target/xsl/util/topo-sort.xsl
new file mode 100644
index 0000000..e4202aa
--- /dev/null
+++ b/build/lib/commons-scxml-js/target/xsl/util/topo-sort.xsl
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/build/lib/library_origins.txt b/build/lib/library_origins.txt
index 5a50573..d925158 100644
--- a/build/lib/library_origins.txt
+++ b/build/lib/library_origins.txt
@@ -6,3 +6,8 @@ ANTLR
Apache Ant Contrib Tasks (Apache Software License)
* ant-contrib-1.0b3.jar
+
+Commons SCXML JS (discontinued Apache Project; Apache Software License)
+* commons-scxml-js
+ (NOTE: this is not the complete source of the SCXML-JS project; only a part)
+
diff --git a/doc/README b/doc/README
index ad67ed8..e1ce95a 100644
--- a/doc/README
+++ b/doc/README
@@ -1,18 +1,26 @@
-For the creation of the Api documentation, yuidoc is used.
+For the creation of the Api documentation, js-toolkit is used.
+Use the provided create_doc.bat file for the creation of the documentation.
+The documentation can be found under PROJECT_PATH\doc\api_doc.
-To install yuidoc, first install Node.js:
-Download and install Node.js (http://nodejs.org/#download)
+The invocation of the api generation is as follows:
-After that install yuidoc via the Node.js command prompt
-npm -g install yuidocjs.
+# MS Windows version (works)
+SET _BASEPATH=%~dp0
+SET TARGETDIR=%_BASEPATH%..\assets\www\javascripts
+SET EXCLUDEDIRS="-E=3rdParty|input_manager_state_chart|DialogDescription.js|grammar.js|gen|.json"
+SET OUTPUTDIR=%_BASEPATH%api_doc
+SET JSDOCDIR=tools\jsdoc-toolkit
+SET TEMPLATEDIR=%JSDOCDIR%\templates
+SET TEMPLATE=jsdoc
+java -jar %JSDOCDIR%\jsrun.jar %JSDOCDIR%\app\run.js -A -t=%TEMPLATEDIR%\%TEMPLATE% -p -v -r %EXCLUDEDIRS% -d=%OUTPUTDIR% -v %TARGETDIR%
-Very Important: copy the adapted docparser in
-/Voice2SocialApp/doc/docparser.js
-to
-%USERPROFILE%\AppData\Roaming\npm\node_modules\yuidocjs\lib
-so that category tags are parsed.
-Now you can open a Node.js command prompt and go to the /Voice2SocialApp/doc directory and execute create_doc.bat (Windows)
-
-The documentation should be created in the /Voice2SocialApp/doc/out directory
---> open /Voice2SocialApp/doc/out/index.html
\ No newline at end of file
+# Linux version (should work, not tested):
+_BASEPATH=$PWD
+TARGETDIR=$_BASEPATH/../assets/www/javascripts
+EXCLUDEDIRS="-E=3rdParty|input_manager_state_chart|DialogDescription.js|grammar.js|gen|.json"
+OUTPUTDIR=$_BASEPATH/api_doc
+JSDOCDIR=./tools/jsdoc-toolkit
+TEMPLATEDIR=$JSDOCDIR/templates
+TEMPLATE=jsdoc
+java -jar $JSDOCDIR/jsrun.jar $JSDOCDIR/app/run.js -A -t=$TEMPLATEDIR/$TEMPLATE -p -v -r $EXCLUDEDIRS -d=$OUTPUTDIR -v $TARGETDIR
\ No newline at end of file
diff --git a/doc/boxstyles.css b/doc/boxstyles.css
new file mode 100644
index 0000000..6768227
--- /dev/null
+++ b/doc/boxstyles.css
@@ -0,0 +1,29 @@
+/* INSERTED START */
+/* Generic box styles. */
+.box {
+ border: 1px solid;
+ border-radius: 3px;
+ margin: 1em 0;
+ padding: 0 1em;
+}
+.box.important {
+/* background: #CCCCFF;
+ background: #FFE2CE; */
+ background: #FF8533;
+ padding: 10px;
+}
+.box.usedby {
+/* background: #CCCCFF;
+ background: #FFE2CE; */
+ background: #FFFFC2;
+ padding: 10px;
+}
+/* INSERTED END */
+
+/* taken from jasmine */
+pre.code
+{
+ display: block;
+ padding: 8px;
+ border: 1px dashed #ccc;
+}
\ No newline at end of file
diff --git a/doc/create_doc.sh b/doc/create_doc.sh
new file mode 100644
index 0000000..b6120af
--- /dev/null
+++ b/doc/create_doc.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Linux version (should work, not tested):
+_BASEPATH=$PWD
+TARGETDIR=$_BASEPATH/../assets/www/javascripts
+EXCLUDEDIRS="-E=3rdParty|input_manager_state_chart|DialogDescription.js|grammar.js|gen|.json"
+OUTPUTDIR=$_BASEPATH/api_doc
+JSDOCDIR=./tools/jsdoc-toolkit
+TEMPLATEDIR=$JSDOCDIR/templates
+TEMPLATE=jsdoc
+java -jar $JSDOCDIR/jsrun.jar $JSDOCDIR/app/run.js -A -t=$TEMPLATEDIR/$TEMPLATE -p -v -r $EXCLUDEDIRS -d=$OUTPUTDIR -v $TARGETDIR
\ No newline at end of file
diff --git a/libs/cordova-2.8.1-mod.jar b/libs/cordova-2.8.1-mod.jar
index fb469b6..15fd79e 100644
Binary files a/libs/cordova-2.8.1-mod.jar and b/libs/cordova-2.8.1-mod.jar differ
diff --git a/parse.xml b/parse.xml
new file mode 100644
index 0000000..ae5f8f4
--- /dev/null
+++ b/parse.xml
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+
+
+
+ function init(){
+ return [ function(){
+
+ org = {};
+ window.org = org;
+ if (typeof org.antlr === "undefined" || !org.antlr) {
+ org.antlr = {};
+ }
+ if (typeof org.antlr.runtime == "undefined" || !org.antlr.runtime) {
+ org.antlr.runtime = {};
+ }
+ if (typeof org.antlr.runtime.tree == "undefined" || !org.antlr.runtime.tree) {
+ org.antlr.runtime.tree = {};
+ }
+
+
+ return ['org', org];
+ }, function(){
+
+
+
+
+
+ return ['md5', CryptoJS];
+ }, function(){
+
+
+ }, function(){
+
+
+ }, function(){
+
+
+ }, function(){
+
+
+ }, function(){
+
+
+ }, function(){
+
+
+ return [ "template-parser",
+ ES3Lexer, ES3Parser, MmirScriptBlockLexer, MmirScriptBlockParser,
+ MmirScriptContentLexer, MmirScriptContentParser, MmirScriptStatementLexer,
+ MmirScriptStatementParser, MmirTemplateLexer //, MmirTemplateParser
+ ];
+ }, function(){
+
+
+ }, function(){
+
+
+ var path = mobileDS.constants.getInstance(forBrowser).getBasePath();
+ console.log('base path: '+path);
+ }, function(){
+
+
+ }, function(){
+
+
+
+ return ['commonUtils', mobileDS.CommonUtils.getInstance()];
+
+ }, function(){
+
+
+
+ return ['configurationManager', mobileDS.ConfigurationManager.getInstance()];
+
+ }, function(){
+
+
+ return ['dictionary', Dictionary];
+ }, function(){
+
+
+ }, function(){
+
+
+
+ return ['mvc',
+ Controller, Helper, ContentElement, Layout, View, Partial, YieldDeclaration
+ ];
+ }, function(){
+
+
+
+ }, function(){
+
+
+
+ }];
+ }//end of init()
+
+ //stored ANT property for target storage-path (target location for storing compiled views);
+ var compiledViewGenPath = '${jsGenDirBase}';
+
+
+
+
+
+
+
+
+
+
+
+ Finished parsing templates (RHINO).
+
+
+
+
+
+
+
+
+ Finished parsing templates (NODEJS).
+
+
+
\ No newline at end of file
diff --git a/res/xml/config.xml b/res/xml/config.xml
index ae90ae8..92de215 100644
--- a/res/xml/config.xml
+++ b/res/xml/config.xml
@@ -144,6 +144,10 @@
+
+
+
diff --git a/src/de/dfki/iui/mmig/MMIGAppActivity.java b/src/de/dfki/iui/mmig/MMIGAppActivity.java
index f58528a..69bcd56 100644
--- a/src/de/dfki/iui/mmig/MMIGAppActivity.java
+++ b/src/de/dfki/iui/mmig/MMIGAppActivity.java
@@ -40,7 +40,9 @@ public class MMIGAppActivity extends DroidGap {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+
+ NuanceEngine.createInstance(this.getContext());
+
// CookieManager.setAcceptFileSchemeCookies(true);
//INCREASE TIMEOUT if you get the error message
@@ -85,6 +87,8 @@ public void onCreate(Bundle savedInstanceState) {
@Override
public void onDestroy() {
+ NuanceEngine.getInstance().releaseResources();
+
super.onDestroy();
}
diff --git a/src/de/dfki/iui/mmig/plugins/AppVolumeControl.java b/src/de/dfki/iui/mmig/plugins/AppVolumeControl.java
new file mode 100644
index 0000000..0f68d89
--- /dev/null
+++ b/src/de/dfki/iui/mmig/plugins/AppVolumeControl.java
@@ -0,0 +1,396 @@
+/*
+ * based on:
+ *
+ * Phonegap VolumeControl Plugin for Android
+ * Cordova 2.2.0
+ * Author: Manuel Simpson
+ * Email: manusimpson[at]gmail[dot]com
+ * Date: 12/28/2012
+ *
+ */
+package de.dfki.iui.mmig.plugins;
+
+import java.util.ArrayList;
+
+import org.apache.cordova.CordovaWebView;
+import org.apache.cordova.api.CallbackContext;
+import org.apache.cordova.api.CordovaInterface;
+import org.apache.cordova.api.CordovaPlugin;
+import org.apache.cordova.api.LOG;
+import org.apache.cordova.api.PluginResult;
+import org.apache.cordova.api.PluginResult.Status;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.database.ContentObserver;
+import android.media.AudioManager;
+import android.os.Handler;
+import android.util.Log;
+
+
+public class AppVolumeControl extends CordovaPlugin {//VolumeControl {
+
+ ////////////////////////// original VolumeControl code: /////////////////////////////////////
+
+ public static final String SET = "setVolume";
+ public static final String GET = "getVolume";
+ public static final String ON = "onVolumeChange";
+// //TODO implement un-register
+// public static final String OFF = "offVolumeChange";
+ protected Context context;
+ protected AudioManager manager;
+
+ @Override
+ public boolean execute(String action, JSONArray args, CallbackContext callbackContext) throws JSONException {
+ boolean actionState = true;
+ context = cordova.getActivity().getApplicationContext();
+// manager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
+ init();
+ if (SET.equals(action)) {
+
+ try {
+
+ //Get the volume value to set
+ int volume = getAsRawVolume(args.getInt(0));
+
+ //Set the volume
+// manager.setStreamVolume(AudioManager.STREAM_MUSIC, volume, AudioManager.FLAG_PLAY_SOUND);
+ setRawVolume(volume);
+
+ callbackContext.success();
+ } catch (Exception e) {
+ LOG.d("VolumeControl", "Error setting volume " + e);
+ actionState = false;
+ }
+ } else if(GET.equals(action)){
+ //Get current system volume
+ int currVol = getCurrentVolume();
+ String strVol= String.valueOf(currVol);
+ callbackContext.success(strVol);
+ LOG.d("VolumeControl", "Current Volume is " + currVol);
+ } else if(ON.equals(action)){
+
+ this.addListener(callbackContext);
+
+ } else {
+ actionState = false;
+ }
+ return actionState;
+ }
+
+ /**
+ * Convert percent-value to absolute volume setting (i.e. "raw" setting of this device).
+ *
+ * @param percent value as percent
+ * @return the raw int volume setting
+ */
+ protected int getAsRawVolume(int percent){
+ int volLevel;
+ int maxVolume = manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+ volLevel = Math.round((percent * maxVolume) / 100);
+
+ return volLevel;
+ }
+
+ protected int getAsPercentVolume(int raw){
+ int maxVolume = manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+ return Math.round((raw * 100) / maxVolume);
+ }
+
+ /**
+ * Get the current volume setting (in percent)
+ * @return int the current volume setting in percent
+ */
+ protected int getCurrentVolume(){
+ try{
+ int volLevel;
+// int maxVolume = manager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
+ int currSystemVol = manager.getStreamVolume(AudioManager.STREAM_MUSIC);
+// volLevel = Math.round((currSystemVol * 100) / maxVolume);
+ volLevel = getAsPercentVolume(currSystemVol);
+
+ return volLevel;
+ }catch (Exception e) {
+ LOG.d("VolumeControl", "getVolume error: " + e);
+ return 1;
+ }
+ }
+ ////////////////////////// original VolumeControl END /////////////////////////////////////
+
+ protected void setRawVolume(int volumeAbsolutValue){
+ init();
+ manager.setStreamVolume(
+ AudioManager.STREAM_MUSIC,
+ volumeAbsolutValue,
+ AudioManager.FLAG_PLAY_SOUND
+ );
+ }
+
+ private static final String NAME = "AppVolumeControl";
+ private static final String KEY_VOLUME = "userAppVolume";
+
+ public static final String RESULT_VALUE_NEW = "value";
+ public static final String RESULT_VALUE_OLD = "oldValue";
+
+
+ /**
+ * The "original" volume setting refers to the volume setting that was present
+ * before this activity was started/resumed.
+ *
+ * NOTE: on closing, pausing the activity, this "original" volume setting should be restored.
+ */
+ private int _originalVolumeSetting;
+
+ private CordovaInterface cordovaActivity;
+
+ private VolumeContentObserver _volumeSettingsObserver;
+ private ArrayList _volumeListener = new ArrayList();
+
+ protected int getCurrentRawVolume(){
+ return manager.getStreamVolume(AudioManager.STREAM_MUSIC);
+ }
+
+ /**
+ * Writes current SYSTEM volume (STREAM_MUSIC) into field "original volume setting" (the setting that was/is active when this activity is NOT running),
+ * i.e. retrieve current system setting for volume (temporary storage).
+ *
+ * NOTE: when this activity is closed/paused, this "original volume setting" should be restored.
+ *
+ * {@link #_originalVolumeSetting}
+ */
+ private void storeOriginalVolumeSetting(){
+ init();
+ this._originalVolumeSetting = getCurrentRawVolume();
+ }
+
+ /**
+ * Sets SYSTEM volume (STREAM_MUSIC) setting (back) to the "original volume setting" (i.e. the instance's field value),
+ * i.e. sets current system setting to this instance's value.
+ *
+ * NOTE: this method should be called, before this activity is closed/paused
+ * NOTE2: the instance's field must have been initialized with the correct value before calling this method
+ * (i.e. {@link #storeOriginalVolumeSetting()} on starting/resuming this activity).
+ *
+ *
+ * {@link #_originalVolumeSetting}
+ */
+ private void restoreOriginalVolumeSetting(){
+ init();
+ setRawVolume(this._originalVolumeSetting);
+// manager.setStreamVolume(
+// AudioManager.STREAM_MUSIC,
+// this._originalVolumeSetting,
+// AudioManager.FLAG_PLAY_SOUND
+// );
+ }
+
+ /**
+ * Stores the (absolute) volume setting into the KEY_STORE (i.e. permanent storage).
+ *
+ * @param userVolume
+ * @param userVolumeLevel
+ */
+ private void storeUserVolumeSetting(int userVolume){
+ init();
+
+ SharedPreferences sharedPref = cordovaActivity.getActivity().getPreferences(Context.MODE_PRIVATE);
+ SharedPreferences.Editor editor = sharedPref.edit();
+ editor.putInt(KEY_VOLUME, userVolume);
+ editor.commit();
+
+ LOG.d(NAME, "stored user volume setting: "+ userVolume+ "%");
+ }
+
+ /**
+ * Reads the volume setting from the KEY_STORE and sets the SYSTEM value accordingly.
+ *
+ */
+ private void restoreUserVolumeSetting(){
+ init();
+
+ SharedPreferences sharedPref = cordovaActivity.getActivity().getPreferences(Context.MODE_PRIVATE);
+ if(sharedPref.contains(KEY_VOLUME)){
+ int userVolume = sharedPref.getInt(KEY_VOLUME, -1);
+
+ if(userVolume != -1){
+
+ int volume = this.getAsRawVolume(userVolume);
+
+ manager.setStreamVolume(
+ AudioManager.STREAM_MUSIC,
+ volume,
+ AudioManager.FLAG_PLAY_SOUND
+ );
+
+ LOG.d(NAME, "restored user volume setting: "+ userVolume + "%");
+ }
+ }
+
+ }
+
+ public void addListener(CallbackContext callback){
+ _volumeListener.add(callback);
+ }
+
+ public void removeListener(CallbackContext callback){
+ _volumeListener.remove(callback);
+ }
+
+ private void init(){
+
+ if(context == null)
+ cordovaActivity = cordova;
+
+ if(context == null)
+ context = cordova.getActivity().getApplicationContext();
+
+ if(manager == null)
+ manager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
+ }
+
+
+ protected void doRegisterVolumeObserver(){
+ if(this._volumeSettingsObserver == null){
+ this._volumeSettingsObserver = new VolumeContentObserver( new Handler() );
+
+ this.context.getContentResolver().registerContentObserver(
+ android.provider.Settings.System.CONTENT_URI,
+ true,
+ _volumeSettingsObserver
+ );
+ }
+ }
+
+ protected void doUnregisterVolumeObserver(){
+ if(this._volumeSettingsObserver != null){
+ VolumeContentObserver temp = this._volumeSettingsObserver;
+ this._volumeSettingsObserver = null;
+ this.context.getContentResolver().unregisterContentObserver(temp);
+ }
+ }
+
+ @Override
+ public void initialize(CordovaInterface cordova, CordovaWebView webView) {
+ this.cordovaActivity = cordova;
+ this.context = cordova.getActivity().getApplicationContext();
+
+ this.storeOriginalVolumeSetting();
+ LOG.d(NAME, "initializing: stored original volume setting: "+this._originalVolumeSetting);
+
+ this.restoreUserVolumeSetting();
+
+ this.doRegisterVolumeObserver();
+
+ super.initialize(cordova, webView);
+ }
+
+ @Override
+ public void onResume(boolean multitasking) {
+ this.storeOriginalVolumeSetting();
+ LOG.d(NAME, "resuming: stored original volume setting: "+this._originalVolumeSetting);
+
+ this.restoreUserVolumeSetting();
+
+ this.doRegisterVolumeObserver();
+
+ super.onResume(multitasking);
+ }
+
+ @Override
+ public void onPause(boolean multitasking) {
+
+ //TODO only store, when plugin's exposed SETTER was called?
+ this.storeUserVolumeSetting(getCurrentVolume());
+
+ LOG.d(NAME, "pausing: restoring original volume setting: "+this._originalVolumeSetting);
+ this.restoreOriginalVolumeSetting();
+
+ this.doUnregisterVolumeObserver();
+
+ super.onPause(multitasking);
+ }
+
+ @Override
+ public void onDestroy() {
+
+ //TODO only store, when plugin's exposed SETTER was called?
+ this.storeUserVolumeSetting(getCurrentVolume());
+
+ LOG.d(NAME, "destroying: restoring original volume setting: "+this._originalVolumeSetting);
+ this.restoreOriginalVolumeSetting();
+
+ this.doUnregisterVolumeObserver();
+
+ super.onDestroy();
+ }
+
+ private class VolumeContentObserver extends ContentObserver {
+
+ private int _currentRawVolume;
+
+
+ public VolumeContentObserver(Handler handler) {
+ super(handler);
+ this._currentRawVolume = getCurrentRawVolume();
+ }
+
+ @Override
+ public boolean deliverSelfNotifications() {
+ return super.deliverSelfNotifications();
+ }
+
+ @Override
+ public void onChange(boolean selfChange) {
+ super.onChange(selfChange);
+ if(selfChange)
+ return;
+
+ int newValue = getCurrentRawVolume();
+ if(newValue != this._currentRawVolume){
+
+ int oldValue = this._currentRawVolume;
+ this._currentRawVolume = newValue;
+
+ Log.d(NAME, String.format("Volume settings change detected, RAW %d -> %d", oldValue, newValue));
+
+ fireVolumeChanged(newValue, oldValue);
+ }
+ }
+
+ protected void fireVolumeChanged(int newRawValue, int oldRawValue){
+ for(CallbackContext c : _volumeListener){
+ JSONObject data = new JSONObject();
+ String error = null;
+
+ try {
+ data.put(RESULT_VALUE_NEW, newRawValue);
+ } catch (JSONException e) {
+ error = e.toString();
+ }
+ try {
+ data.put(RESULT_VALUE_NEW, getAsPercentVolume(newRawValue));
+ data.put(RESULT_VALUE_OLD, getAsPercentVolume(oldRawValue));
+ } catch (JSONException e) {
+ if(error != null)
+ error = ", " + e.toString();
+ else
+ error = e.toString();
+ }
+
+ PluginResult returnValue;
+ if(error!=null)
+ returnValue = new PluginResult(Status.ERROR, error);
+ else
+ returnValue = new PluginResult(Status.OK,data);
+
+ returnValue.setKeepCallback(true);
+ c.sendPluginResult(returnValue);
+ }
+ }
+
+ }
+
+}
diff --git a/test/build.xml b/test/build.xml
new file mode 100644
index 0000000..00d2594
--- /dev/null
+++ b/test/build.xml
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/cases/emulation/Controller.js b/test/cases/emulation/Controller.js
new file mode 100644
index 0000000..607e3ea
--- /dev/null
+++ b/test/cases/emulation/Controller.js
@@ -0,0 +1,18 @@
+// emulate Controller
+Controller = function(name, jsonDef){
+ var self = this;
+ if (name != null){
+ this.name = name;
+ // jstestdriver.console.log("[DEBUG - Controller] New Name: " + this.name);
+ }
+ return {
+ loadHelper: function(name, path){
+ },
+
+ getName: function(){
+ // jstestdriver.console.log("[DEBUG - Controller] Name: " + self.name);
+ return self.name;
+ }
+ }
+};
+
diff --git a/test/cases/emulation/commonUtils.js b/test/cases/emulation/commonUtils.js
new file mode 100644
index 0000000..8e933a3
--- /dev/null
+++ b/test/cases/emulation/commonUtils.js
@@ -0,0 +1,24 @@
+// emulate CommonUtils
+// Create needed Spies
+var mobileDS = window.mobileDS || {};
+mobileDS.CommonUtils = {};
+mobileDS.CommonUtils.getInstance = jasmine.createSpy('getInstance');
+mobileDS.CommonUtils.getInstance.andCallFake(function(){
+ return {
+ getDirectoryContentsWithFilter: function() {
+ retFiles = Array();
+ retFiles.push("Controller1.js");
+ retFiles.push("Controller2.js");
+ return retFiles;
+ },
+ getPartialsPrefix: function() {
+ return "~";
+ },
+ getLocalScript: function(script_src, func_success, func_error) {
+ func_success && func_success();
+ },
+ isRunningOnSmartphone: function(){
+ return true;
+ }
+ }
+});
diff --git a/test/cases/mds/TestConstants.js b/test/cases/mds/TestConstants.js
new file mode 100644
index 0000000..f68f5b8
--- /dev/null
+++ b/test/cases/mds/TestConstants.js
@@ -0,0 +1,104 @@
+describe("tools/constants", function() {
+
+ describe("initialization needed", function() {
+ beforeEach(function() {
+ // set global variables
+ });
+
+ it("check for constants - getDictionaryFilename", function() {
+ // after = "grammar.json";
+ expect(mobileDS.constants.getInstance().getDictionaryFilename()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getGrammarFilename", function() {
+ // after = "grammar.json";
+ expect(mobileDS.constants.getInstance().getGrammarFilename()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getBasePath - forBrowser: true", function() {
+ // after = "";
+ expect(mobileDS.constants.getInstance(true).getBasePath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getBasePath - forBrowser: false", function() {
+ // after = "file:///android_asset/www/";
+ expect(mobileDS.constants.getInstance(false).getBasePath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getBasePath - forBrowser: null", function() {
+ // after = "file:///android_asset/www/";
+ expect(mobileDS.constants.getInstance(null).getBasePath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getViewPath", function() {
+ // after = "views/";
+ expect(mobileDS.constants.getInstance().getViewPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getPluginsPath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getPluginsPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getLayoutPath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getLayoutPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getModelPath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getModelPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getViewPath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getViewPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getControllerPath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getControllerPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getLanguagePath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getLanguagePath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getHelperPath", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getHelperPath()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getConfigurationFileUrl", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getConfigurationFileUrl()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getDictionaryFilename", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getDictionaryFilename()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getGrammarFilename", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getGrammarFilename()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getPartialsPrefix", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getPartialsPrefix()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getHelperSuffix", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getHelperSuffix()).toEqual(jasmine.any(String));
+ });
+
+ it("check for constants - getLanguage", function() {
+ // after = "file:///android_asset/www/views/";
+ expect(mobileDS.constants.getInstance(false).getLanguage()).toEqual(jasmine.any(String));
+ });
+
+ });
+});
\ No newline at end of file
diff --git a/test/cases/mds/TestControllerManager.js b/test/cases/mds/TestControllerManager.js
new file mode 100644
index 0000000..3a8cb9e
--- /dev/null
+++ b/test/cases/mds/TestControllerManager.js
@@ -0,0 +1,35 @@
+describe("manager/controllerManager", function() {
+ // needed global vars
+ controllerPath="controller";
+ viewPath="views";
+ forBrowser=false;
+
+ // EMULATION of functionality
+ // START ============================================================================
+ // END ============================================================================
+
+ describe("initialization working", function() {
+ it("is singleton instance available", function() {
+ mobileDS.ControllerManager.initializeControllers(function(){
+ expect(mobileDS.ControllerManager.getInstance()).toEqual(jasmine.any(Object));
+ });
+ });
+ });
+
+ describe("initialization needed", function() {
+ beforeEach(function() {
+ // set global variables
+ });
+
+ it("check for controllers", function() {
+ mobileDS.ControllerManager.initializeControllers();
+ // after = ["Controller1", "Controller2w"];
+ after = [jasmine.any(Object), jasmine.any(Object)];
+ expect(mobileDS.ControllerManager.getInstance().getControllers()).toEqual(after);
+ });
+
+ it("getController", function() {
+ expect(mobileDS.ControllerManager.getInstance().getController("Controller1")).toEqual(jasmine.any(Object));
+ });
+ });
+});
\ No newline at end of file
diff --git a/test/cases/mds/TestLanguageManager.js b/test/cases/mds/TestLanguageManager.js
new file mode 100644
index 0000000..ed7a058
--- /dev/null
+++ b/test/cases/mds/TestLanguageManager.js
@@ -0,0 +1,77 @@
+
+describe("manager/languageManager", function() {
+ // needed global vars
+ // controllerPath="controller";
+ // viewPath="views";
+ IS_DEBUG_ENABLED=false;
+ forBrowser=true;
+
+ // EMULATION of functionality
+ // START ============================================================================
+ // END ============================================================================
+
+ describe("commonUtils needed", function() {
+ var commonUtils;
+ var langManager;
+ window = {};
+ dirObj={"/config/languages":["aa","de","en","zy"],"/config/languages/aa":["dictionary.dic","grammar.json"],"/config/languages/de":["dictionary.dic","grammar.json"],"/config/languages/en":["dictionary.dic"],"/config/languages/zy":[]}
+
+ beforeEach(function() {
+ // set global variables
+ basePath = "file:///android_asset/www/";
+ pluginsPath = basePath+"mmirf/plugins/";
+
+ window.plugins = {};
+ window.plugins.directoryListing = {};
+ window.plugins.directoryListing.getDirectoryStructure = jasmine.createSpy('getDirectoryStructure');
+ window.plugins.directoryListing.getDirectoryStructure.andCallFake(function(dir, cb){
+ if ((cb) && (typeof cb == 'function')){
+ cb(dirObj);
+ }
+ });
+
+ navigator = {};
+ navigator.network = {};
+ navigator.network.connection = {};
+ navigator.network.connection.type = jasmine.createSpy('type');
+
+ Connection = jasmine.createSpyObj('Connection', ['NONE', 'WIFI']);
+
+ commonUtils = mobileDS.CommonUtils.getInstance();
+ commonUtils.initialize();
+ langManager = mobileDS.LanguageManager.getInstance("de");
+ });
+ it("Get languages", function() {
+ var after = ["aa", "de", "en", "zy"];
+ expect(mobileDS.LanguageManager.getInstance().getLanguages()).toEqual(after);
+ });
+ it("Dictionary - zy", function() {
+ expect(langManager.existsDictionaryForLanguage("zy")).toEqual(false);
+ });
+ it("Grammar - zy", function() {
+ expect(langManager.existsGrammarForLanguage("zy")).toEqual(false);
+ });
+ it("Dictionary - de", function() {
+ expect(langManager.existsDictionaryForLanguage("de")).toEqual(true);
+ });
+ it("Grammar - de", function() {
+ expect(langManager.existsGrammarForLanguage("de")).toEqual(true);
+ });
+ it("Determine language", function() {
+ expect(langManager.determineLanguage()).toEqual("aa");
+ });
+ it("Set language to de", function() {
+ expect(langManager.setLanguage("de")).toEqual("de");
+ });
+ it("Get language", function() {
+ expect(langManager.getLanguage()).toEqual("de");
+ });
+ it("Get default language", function() {
+ expect(langManager.getDefaultLanguage()).toEqual(jasmine.any(String));
+ });
+ it("Cycle language", function() {
+ expect(langManager.cycleLanguages()).toEqual("en");
+ });
+ });
+
+});
\ No newline at end of file
diff --git a/test/cases/mds/TestPresentationManager.js b/test/cases/mds/TestPresentationManager.js
new file mode 100644
index 0000000..2ab2446
--- /dev/null
+++ b/test/cases/mds/TestPresentationManager.js
@@ -0,0 +1,42 @@
+describe("manager/presentationManager", function() {
+ // needed global vars
+ controllerPath="controller";
+ viewPath="views";
+ forBrowser = true;
+ IS_DEBUG_ENABLED = false;
+
+ describe("initialization working", function() {
+ it("is singleton instance available", function() {
+ mobileDS.ControllerManager.initializeControllers();
+ // expect(mobileDS.ControllerManager.getInstance()).toEqual(jasmine.any(Object));
+ expect(mobileDS.PresentationManager.getInstance()).toEqual(jasmine.any(Object));
+
+ // expect(mobileDS.PresentationManager.getInstance()).toEqual(jasmine.any(Object));
+ });
+
+ it("getLayout", function() {
+ mobileDS.ControllerManager.initializeControllers();
+ // expect(mobileDS.ControllerManager.getInstance()).toEqual(jasmine.any(Object));
+ expect(mobileDS.PresentationManager.getInstance().getLayout()).toEqual("iokiojk");
+
+ // expect(mobileDS.PresentationManager.getInstance()).toEqual(jasmine.any(Object));
+ });
+ });
+
+ // describe("initialization needed", function() {
+ // beforeEach(function() {
+ // // set global variables
+ // });
+
+ // it("check for controllers", function() {
+ // mobileDS.ControllerManager.initializeControllers();
+ // // after = ["Controller1", "Controller2w"];
+ // after = [jasmine.any(Object), jasmine.any(Object)];
+ // expect(mobileDS.ControllerManager.getInstance().getControllers()).toEqual(after);
+ // });
+
+ // it("getController", function() {
+ // expect(mobileDS.ControllerManager.getInstance().getController("Controller1")).toEqual(jasmine.any(Object));
+ // });
+ // });
+});
\ No newline at end of file
diff --git a/test/drivers/jsTestDriverConstants.conf b/test/drivers/jsTestDriverConstants.conf
new file mode 100644
index 0000000..c674071
--- /dev/null
+++ b/test/drivers/jsTestDriverConstants.conf
@@ -0,0 +1,16 @@
+server: http://localhost:52525
+
+load:
+ - ../lib/jasmine-1.3.1/jasmine.js
+ - ../lib/jasmine-1.3.1/JasmineAdapter.js
+
+## external scripts
+# - ../../assets/www/mmirf/res/libs/jquery-1.8.3.min.js
+
+## needed "emulation" files
+# - ../cases/emulation/commonUtils.js
+
+ - ../../assets/www/mmirf/tools/constants.js
+
+test:
+ - ../cases/mds/TestConstants.js
diff --git a/test/drivers/jsTestDriverControllerManager.conf b/test/drivers/jsTestDriverControllerManager.conf
new file mode 100644
index 0000000..792d421
--- /dev/null
+++ b/test/drivers/jsTestDriverControllerManager.conf
@@ -0,0 +1,19 @@
+server: http://localhost:52525
+
+load:
+ - ../lib/jasmine-1.3.1/jasmine.js
+ - ../lib/jasmine-1.3.1/JasmineAdapter.js
+ - ../../assets/www/mmirf/tools/constants.js
+
+ - ../../assets/www/mmirf/manager/controllerManager.js
+
+## external scripts
+ - ../../assets/www/mmirf/res/libs/jquery-1.8.3.min.js
+
+## needed "emulation" files
+ - ../cases/emulation/commonUtils.js
+ - ../cases/emulation/Controller.js
+
+
+test:
+ - ../cases/mds/TestControllerManager.js
diff --git a/test/drivers/jsTestDriverLanguageManager.conf b/test/drivers/jsTestDriverLanguageManager.conf
new file mode 100644
index 0000000..05a0407
--- /dev/null
+++ b/test/drivers/jsTestDriverLanguageManager.conf
@@ -0,0 +1,16 @@
+server: http://localhost:52525
+
+load:
+ - ../lib/jasmine-1.3.1/jasmine.js
+ - ../lib/jasmine-1.3.1/JasmineAdapter.js
+
+ - ../../assets/www/mmirf/tools/commonUtils.js
+ - ../../assets/www/mmirf/tools/constants.js
+ - ../../assets/www/mmirf/tools/StringExtensions.js
+ - ../../assets/www/mmirf/manager/settings/languageManager.js
+
+## external scripts
+ - ../../assets/www/mmirf/res/libs/jquery-1.8.3.min.js
+
+test:
+ - ../cases/mds/TestLanguageManager.js
diff --git a/test/drivers/jsTestDriverPresentationManager.conf b/test/drivers/jsTestDriverPresentationManager.conf
new file mode 100644
index 0000000..883a1c2
--- /dev/null
+++ b/test/drivers/jsTestDriverPresentationManager.conf
@@ -0,0 +1,43 @@
+server: http://localhost:52525
+
+load:
+### external scripts
+### - ../../assets/www/mmirf/res/libs/jquery-1.8.3.min.js
+ - ../../assets/www/mmirf/res/libs/jquery*.js
+ - ../../assets/www/mmirf/res/libs/antlr3-all-min.js
+ - ../lib/jasmine-1.3.1/jasmine.js
+ - ../lib/jasmine-1.3.1/JasmineAdapter.js
+
+### generated Parsers
+ - ../../assets/www/mmirf/gen/parser/ES3Lexer.js
+ - ../../assets/www/mmirf/gen/parser/ES3Parser.js
+ - ../../assets/www/mmirf/gen/parser/MmirTemplateLexer.js
+ - ../../assets/www/mmirf/gen/parser/MmirScriptBlockLexer.js
+ - ../../assets/www/mmirf/gen/parser/MmirScriptBlockParser.js
+ - ../../assets/www/mmirf/gen/parser/MmirScriptStatementLexer.js
+ - ../../assets/www/mmirf/gen/parser/MmirScriptStatementParser.js
+ - ../../assets/www/mmirf/gen/parser/MmirScriptContentLexer.js
+ - ../../assets/www/mmirf/gen/parser/MmirScriptContentParser.js
+
+### other needed scripts
+ - ../../assets/www/mmirf/tools/commonUtils.js
+ - ../../assets/www/mmirf/tools/constants.js
+ - ../../assets/www/mmirf/tools/StringExtensions.js
+ - ../../assets/www/mmirf/manager/settings/languageManager.js
+ - ../../assets/www/mmirf/mvc/templateParseUtils.js
+ - ../../assets/www/mmirf/manager/controllerManager.js
+
+### emulation
+ - ../cases/emulation/Controller.js
+
+### test file
+ - ../../assets/www/mmirf/manager/presentationManager.js
+
+
+## needed "emulation" files
+# - ../cases/emulation/commonUtils.js
+# - ../cases/emulation/Controller.js
+
+
+test:
+ - ../cases/mds/TestPresentationManager.js
diff --git a/test/loadtest.js b/test/loadtest.js
new file mode 100644
index 0000000..30fd151
--- /dev/null
+++ b/test/loadtest.js
@@ -0,0 +1,2 @@
+testvar="test"
+jstestdriver.console.log("test-file 'loadtest.js' loaded.")
\ No newline at end of file
diff --git a/test/scripts/jsTestDriverPOIMetadata.conf b/test/scripts/jsTestDriverPOIMetadata.conf
new file mode 100644
index 0000000..0f916ea
--- /dev/null
+++ b/test/scripts/jsTestDriverPOIMetadata.conf
@@ -0,0 +1,10 @@
+server: http://localhost:9876
+
+load:
+ - ../lib/jasmine-1.3.1/jasmine.js
+ - ../lib/jasmine-1.3.1/JasmineAdapter.js
+
+ - ../../assets/www/models/
+
+test:
+ - ../cases/app/
diff --git a/test/scripts/loadtest.js b/test/scripts/loadtest.js
new file mode 100644
index 0000000..30fd151
--- /dev/null
+++ b/test/scripts/loadtest.js
@@ -0,0 +1,2 @@
+testvar="test"
+jstestdriver.console.log("test-file 'loadtest.js' loaded.")
\ No newline at end of file
diff --git a/version.txt b/version.txt
index a79efdb..f9fd847 100644
--- a/version.txt
+++ b/version.txt
@@ -1,7 +1,7 @@
-version notes for MMIG Starter Kit (v 2.2)
+version notes for MMIG Starter Kit (v 2.4)
- * using Cordova 2.8.x library
+ * using Cordova 2.8.x library (modified; source code included in JAR)
* using jQuery 1.9.x library
* using jQuery Mobile 1.3.x library
@@ -9,9 +9,100 @@ version notes for MMIG Starter Kit (v 2.2)
--------------
Change Log
--------------
- ##################
+
+##################
+ Version 2.4
+##################
+
+ * implemented pre-compilation for templates (eHTML)
+ * completed implementation for storing & loading compiled template files
+ * added pre-compilation code for template-parsing task (in ANT parse.xml)
+ * added mechanism for loading pre-compiled templates
+ * configuration for enabling/disabling usage of pre-compiled files
+ * included up-to-date check (using MD5-checksums) to verify that compiled templates are up-to-date
+ * grammars:
+ * added English example grammar (from/used in smart-case example)
+ * example Japanese dictionary and (minimal) grammar
+ * test page for semantic-interpreter: FIX in language-selection menu (dropdown box): select currently set language on page-load (before: first entry in the list was selected)
+ * CommonUtils:
+ * BUGFIX create instance with new (avoid var-leaking into global namespace)
+ * updated network-checking code (to reflect/use current Cordova-implementation)
+ * ControllerManager: refactored info-object creation (for preparing controller-/view-loading)
+ * BUGFIX load input-manager asynchronously
+ * BUGFIX prevent default-click behavior in DEFAULT-BUTTON-HANDLER (see vclick handling in executeAfterEachPageIsLoaded())
+ * cordovaAudioOutput
+ * removed some commments
+ * BUGFIX for implementation of isPaused() function
+ * slightly modified stop() implementation
+ * removed unnecessary/obsolete callback-id-list mechanism
+ * FIX: remove onCanPlay listener after first invocation
+ * FIXED/IMPROVED status-dependent functions (stop() etc);
+ * NOTE intialization only works error-free in combinaiton with modification in Cordova resources so that on-init event for media/audio is correctly fired in case of async-preparation
+ * FIX included private field for audio status in order to avoid Exceptions in stop() function
+ * Cordova (MODIFIACATION for 2.8.1 JAR)
+ * added listeners in Audio impl. in order to avoid ERROR output (for normal/regular behavior) to LogCat
+ * BUGFIX in onPreparation() in case of async preparation: only signal MEDIA_STARTING if the current state is lower (e.g. do nothing if already playing)
+ * FIX for media/audio initialization: in case of async-preparation now INIT-callback is triggered when prepared-listener is invoked (not directly when async-preparation is started as before)
+ * html5AudioOutput
+ * remove console debug output
+ * FIX / WORKAROUND for stop/replay: in case audio does not support timeranges (dependent on server), audio is reloaded, since we cannot reset currentTime to 0
+ * BUGFIX need this-reference for removing listener in audio-object
+ * BUGFIX for initialization listener (should only be called once)
+ * maryTextToSpeech
+ * BUGFIX trigger onEnd-callback in tts-function if cancel-function is called (i.e. notify ending of TTS)
+ * FIX set onEnd-callback to null, after calling (avoiding possible, multiple calls to same callback)
+ * FIX apply encodeURIComponents() to text/sentence before sending to MARY (instead of just encoding space chars)
+ * webkitAudioInput
+ * BUGFIX for recognize() implementation
+ * BUGFIX need to reset variable aborted, otherwise recognition assumes abortion on every listener-callback, if abort/cancel has been invoked once before
+ * BUGFIX only restart asr if no speech is detected.
+ * BUGFIX for BUG in case of more than one instance running, ASR would get stuck in an infinite loop
+ * Notification
+ * BUGFIX for callback triggering (avoid null-pointer exceptions)
+ * DISABLED releasing resources on pause (in order to be able to play notification sounds as long as app is only paused and not exited yet)
+ * added & implemented optional parameter isKeepOnPause for creating notifications sounds (only relevant for ANDROID): if set, sounds are not released when APP pauses
+ * added initSound() function (for avoiding double-triggering sound upon first playing, e.g. BEEP feedback after starting/resuming APP)
+ * REFACTORED private method for getting audio-object from internal cache
+ * removed language-specific functionality from ConfigurationManager (set to @deprecated: instead the LanguageManager should be used directly)
+ * modified ANT tasks to use integrated SCXML-JS for compiling dialog- and input-engine
+ * buil-properties/-settings:
+ * removed properties in build-setting files and ANT script that were required for previous solution (i.e. usage of external SCXML-JS)
+ * added/extended comments and added example for referencing nodejs in standard MacOS-environment
+
+
+##################
+ Version 2.3
+##################
+ * notification: added stopSound() function
+ * Templating (ehtml): added stringify() function for template representation objects
+ * Controllers/PresentationManager: added optional callback before_page_load()
+ * env/media:
+ * added new Audio Input Module webkitAudioInput.js
+ * some BUGFIXes for audio output modules (html5 and cordova)
+ * updated recorder.js/recorderWorker.js
+ * FIX for hmtl5AudioInput.js in new Chrome version (> 30.x.x): due to performance problems (-> "stutter" in encoded WAV audio) integrated silenceDetection into audio-input module (recorder/recorderWorker)
+ * added VolumeControl plugin (ANDROID): control Android's volume setting and store/restore volume setting on leaving/entering the APP
+ * added textarea to login view, and ctrl code for speech input (for TESTING speech input; DISABLED by default)
+ * (changed default configuration for HTML5-speech-input's WebSocket to default port of new service-implementation)
+ * added UNICODE support for grammars (UNICODE characters need to be masked within grammar code, since JS/CC cannot handle these!)
+ - TODO remove obsolete UMLAUTs handling
+ * improved handling of SEMANTIC object in grammar, in case TOKENS / UTTERANCES are referenced multiple times within a phrase
+ * BUGFIX handling empty stopword list in grammar definitions (JSON)
+ * BUGFIX for testSemanticInterpreter.html:
+ - initialize with controls with correct default-language
+ - remove languages where no grammar is available, from drop-down list
+ * improved testSemanticInterpreter.html
+ - improved layout, added descriptions
+ - added mask/unmask option for JSON values (-> for non-ASCI unicode chars)
+ * added check / detailed error message for invalid JSON grammars
+ - using json-lint
+ - added check / detail message for build.xml
+ - added check / detail message for testSemanticInterpreter.html
+
+
+##################
Version 2.2
- ##################
+##################
* added transitions (animations) for views: now jQuery Mobile page transitions can be used in render(..., {transition: 'jqm transition name', reverse: [true|false]})
- default transition now set in PresentationManager (to: 'none'), instead of in main.js::afterLoadingControllers()
@@ -34,9 +125,9 @@ version notes for MMIG Starter Kit (v 2.2)
* updated HTML test page for grammar generation/testing (for new multi-language support of grammars)
* some updates in user-guide.pdf
- ##################
+##################
Version 2.1
- ##################
+##################
* ModelManger:
- API change: now use create(callback) before first usage (instead of getInstance(callback))
@@ -56,9 +147,9 @@ version notes for MMIG Starter Kit (v 2.2)
- doc (generate HTML documentation for framework code; WINDOWS only)
- targets for compiling all available grammar.json files
- ##################
+##################
Version 2.0
- ##################
+##################
----------------------
TODO (changes that may effect application specific code)
----------------------
@@ -94,8 +185,8 @@ TODO (changes that may effect application specific code)
* DialogEngine: renamed functions
- show_dialog: showDialog
- close_current_dialog: hideCurrentDialog
- - show_wait_dialog:
- - close_wait_dialog:
+ - show_wait_dialog: showWaitDialog
+ - close_wait_dialog: hideWaitDialog
- get_on_page_loaded: getOnPageRenderedHandler
- set_on_page_loaded: setOnPageRenderedHandler
- perform_helper_method: performHelper
@@ -143,16 +234,6 @@ TODO (changes that may effect application specific code)
-> NOTE: these can be made re-available by calling setToCompatibilityMode() on the CommonUtils object
- * in LanguageManager removed deprecated function:
- - translateHTML
- - changeLanguage (this was/is an application specific function; a "copy" is available in controller/application.js)
- - getCurrentLanguage (same as getLanguage)
- * renamed:
- - existsGrammarForLanguage: existsGrammar
- - existsDictionaryForLanguage: existsDictionary
- - existsSpeakerForLanguage: existsSpeaker
- - cycleLanguages: setNextLanguage
- -> NOTE: these can be made re-available by calling setToCompatibilityMode() on the LanguageManager object
* in LanguageManager removed deprecated function:
- translateHTML
- changeLanguage (this was/is an application specific function; a "copy" is available in controller/application.js)
@@ -256,9 +337,9 @@ Change Information (changes that mostly concern internal framework code)
- dialogDescription.xml: dialogDescriptionSCXML.xml
- DialogEngine.js: dialogEngine.js
- ##################
+##################
Version 1.0
- ##################
+##################
* added support for Partial views
* extended support for template expressions: