Merge branch 'bk_xmla_client.dev.171108' into merge_jio_xmla.171114

apps/spreadsheeteditor/main/app.js

@@ -54,6 +54,8 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
+        Xmla            : '../vendor/xmla4js/Xmla-compiled',
+        RSVP            : '../vendor/rsvp/rsvp.min',
         jszip           : '../vendor/jszip/jszip.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         jsrsasign       : '../vendor/jsrsasign/jsrsasign-latest-all-min',
@@ -109,6 +111,8 @@ require.config({
                 'allfonts',
                 'xregexp',
                 'sockjs',
+                'window!Xmla',
+                'RSVP',
                 'jszip',
                 'jsziputils'
             ]

apps/spreadsheeteditor/main/app_dev.js

@@ -54,6 +54,8 @@ require.config({
         jmousewheel     : '../vendor/perfect-scrollbar/src/jquery.mousewheel',
         xregexp         : '../vendor/xregexp/xregexp-all-min',
         sockjs          : '../vendor/sockjs/sockjs.min',
+        Xmla            : '../vendor/xmla4js/Xmla-compiled',
+        RSVP            : '../vendor/rsvp/rsvp.min',
         jszip           : '../vendor/jszip/jszip.min',
         jsziputils      : '../vendor/jszip-utils/jszip-utils.min',
         api             : 'api/documents/api',

apps/spreadsheeteditor/main/index.html

@@ -272,6 +272,8 @@
 
     <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
+    <script type="text/javascript" src="../../../vendor/rsvp/rsvp.min.js"></script>
+    <script type="text/javascript" src="../../../vendor/xmla4js/Xmla-compiled.js"></script>
 
     <script type="text/javascript" src="../sdk_dev_scripts.js"></script>
     <script>

apps/window.js

+/*jslint browser:true, indent:2*/
+/*global define, require*/ // Require.JS
+
+define(function () {
+  'use strict';
+
+  return {
+    /**
+     * @param {String} name This is the name of the desired resource module.
+     * @param {Function} req Provides a "require" to load other modules.
+     * @param {Function} load Pass the module's result to this function.
+     * @param {Object} config Provides the optimizer's configuration.
+     */
+    load: function (name, req, load) { // , config
+      req([name], function (result) {
+        if (typeof(window) !== 'undefined') {
+          window[name] = result;
+        }
+        load(result);
+      });
+    }
+  };
+});

build/Gruntfile.js

@@ -110,6 +110,8 @@ module.exports = function(grunt) {
     doRegisterTask('megapixel');
     doRegisterTask('jquery');
     doRegisterTask('underscore');
+    doRegisterTask('xmla4js');
+    doRegisterTask('rsvp');
     doRegisterTask('zeroclipboard');
     doRegisterTask('bootstrap');
     doRegisterTask('jszip');
@@ -369,6 +371,8 @@ module.exports = function(grunt) {
     grunt.registerTask('deploy-xregexp',                ['xregexp-init', 'clean', 'copy']);
     grunt.registerTask('deploy-megapixel',              ['megapixel-init', 'clean', 'copy']);
     grunt.registerTask('deploy-jquery',                 ['jquery-init', 'clean', 'copy']);
+    grunt.registerTask('deploy-xmla4js',                ['xmla4js-init', 'clean', 'copy']);
+    grunt.registerTask('deploy-rsvp',                   ['rsvp-init', 'clean', 'copy']);
     grunt.registerTask('deploy-underscore',             ['underscore-init', 'clean', 'copy']);
     grunt.registerTask('deploy-bootstrap',              ['bootstrap-init', 'clean', 'copy']);
     grunt.registerTask('deploy-jszip',                  ['jszip-init', 'clean', 'copy']);

build/common.json

@@ -140,6 +140,28 @@
             }
         }
     },
+    "xmla4js": {
+        "clean": [
+            "../deploy/web-apps/vendor/xmla4js"
+        ],
+        "copy": {
+            "script": {
+                "src": "../vendor/xmla4js/Xmla-compiled.js",
+                "dest": "../deploy/web-apps/vendor/xmla4js/Xmla-compiled.js"
+            }
+        }
+    },
+    "rsvp": {
+        "clean": [
+            "../deploy/web-apps/vendor/rsvp"
+        ],
+        "copy": {
+            "script": {
+                "src": "../vendor/rsvp/rsvp.min.js",
+                "dest": "../deploy/web-apps/vendor/rsvp/rsvp.min.js"
+            }
+        }
+    },
     "jszip": {
         "clean": [
             "../deploy/web-apps/vendor/jszip"
@@ -190,6 +212,8 @@
             "deploy-sockjs",
             "deploy-xregexp",
             "deploy-requirejs",
+            "deploy-xmla4js",
+            "deploy-rsvp",
             "deploy-megapixel",
             "deploy-jquery",
             "deploy-underscore",

build/spreadsheeteditor.json

@@ -27,6 +27,8 @@
                         "perfectscrollbar": "common/main/lib/mods/perfect-scrollbar",
                         "jmousewheel": "../vendor/perfect-scrollbar/src/jquery.mousewheel",
                         "xregexp": "empty:",
+                        "Xmla": "empty:",
+                        "RSVP": "empty:",
                         "sockjs": "empty:",
                         "jszip": "empty:",
                         "jszip-utils": "empty:",
@@ -83,6 +85,8 @@
                                 "allfonts",
                                 "xregexp",
                                 "sockjs",
+                                "window!Xmla",
+                                "RSVP",
                                 "jszip",
                                 "jszip-utils"
                             ]
@@ -203,6 +207,8 @@
                         "framework7": "../vendor/framework7/js/framework7",
                         "text": "../vendor/requirejs-text/text",
                         "xregexp": "empty:",
+                        "Xmla": "empty:",
+                        "RSVP": "empty:",
                         "sockjs": "empty:",
                         "jszip": "empty:",
                         "jszip-utils": "empty:",
@@ -261,6 +267,8 @@
                                 "coapisettings",
                                 "allfonts",
                                 "xregexp",
+                                "window!Xmla",
+                                "RSVP",
                                 "sockjs",
                                 "jszip",
                                 "jszip-utils"