Merge pull request #84 from magento-vanilla/MAGETWO-43201-merchant_beta

[Vanilla] Magetwo 43201 merchant beta

app/code/Magento/Theme/view/base/requirejs-config.js

@@ -41,7 +41,7 @@ var config = {
         "jquery/jquery.hashchange": "jquery/jquery.ba-hashchange.min",
         "prototype": "legacy-build.min",
         "jquery/jquery-storageapi": "jquery/jquery.storageapi.min",
-        "text": "requirejs/text",
+        "text": "mage/requirejs/text",
         "domReady": "requirejs/domReady",
         "ko": "ko/ko",
         "tinymce": "tiny_mce/tiny_mce_src"

lib/web/mage/requirejs/static.js

@@ -281,7 +281,7 @@ define('jsbuild', [
 define('text', [
     'module',
     'buildTools',
-    'requirejs/text'
+    'mage/requirejs/text'
 ], function (module, tools, text) {
     'use strict';
 

lib/web/mage/requirejs/text.js

@@ -0,0 +1,157 @@
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+/* inspired by http://github.com/requirejs/text */
+/*global XMLHttpRequest, XDomainRequest */
+
+define(['module'], function (module) {
+    'use strict';
+
+    var xmlRegExp = /^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,
+        bodyRegExp = /<body[^>]*>\s*([\s\S]+)\s*<\/body>/im,
+        stripReg = /!strip$/i,
+        defaultConfig = module.config && module.config() || {};
+
+    /**
+     * Strips <?xml ...?> declarations so that external SVG and XML documents can be
+     * added to a document without worry.
+     * Also, if the string is an HTML document, only the part inside the body tag is returned.
+     *
+     * @param {String} external
+     * @returns {String}
+     */
+    function stripContent(external) {
+        var matches;
+
+        if (!external) {
+            return '';
+        }
+
+        matches = external.match(bodyRegExp);
+        external = matches ?
+            matches[1] :
+            external.replace(xmlRegExp, '');
+
+        return external;
+    }
+
+    /**
+     * Checks that url match current location
+     *
+     * @param {String} url
+     * @returns {Boolean}
+     */
+    function sameDomain(url) {
+        var uProtocol, uHostName, uPort,
+            xdRegExp = /^([\w:]+)?\/\/([^\/\\]+)/i,
+            location = window.location,
+            match = xdRegExp.exec(url);
+
+        if (!match) {
+            return true;
+        }
+        uProtocol = match[1];
+        uHostName = match[2];
+
+        uHostName = uHostName.split(':');
+        uPort = uHostName[1] || '';
+        uHostName = uHostName[0];
+
+        return (!uProtocol || uProtocol === location.protocol) &&
+            (!uHostName || uHostName.toLowerCase() === location.hostname.toLowerCase()) &&
+            (!uPort && !uHostName || uPort === location.port);
+    }
+
+    /**
+     * @returns {XMLHttpRequest|XDomainRequest|null}
+     */
+    function createRequest(url) {
+        var xhr = new XMLHttpRequest();
+
+        if (!sameDomain(url) && typeof XDomainRequest !== 'undefined') {
+            xhr = new XDomainRequest();
+        }
+
+        return xhr;
+    }
+
+    /**
+     * XHR requester. Returns value to callback.
+     *
+     * @param {String} url
+     * @param {Function} callback
+     * @param {Function} fail
+     * @param {Object} headers
+     */
+    function getContent(url, callback, fail, headers) {
+        var xhr = createRequest(url),
+            header,
+            errorHandler = fail || Function();
+
+        /*eslint-disable max-depth */
+        if ('setRequestHeader' in xhr && headers) {
+            for (header in headers) {
+                if (headers.hasOwnProperty(header)) {
+                    xhr.setRequestHeader(header.toLowerCase(), headers[header]);
+                }
+            }
+        }
+
+        /*eslint-enable max-depth */
+
+        if (defaultConfig.onXhr) {
+            defaultConfig.onXhr(xhr, url);
+        }
+
+        /**
+         * onload handler
+         */
+        xhr.onload = function () {
+
+            callback(xhr.responseText);
+
+            if (defaultConfig.onXhrComplete) {
+                defaultConfig.onXhrComplete(xhr, url);
+            }
+        };
+
+        /**
+         * onerror handler
+         */
+        xhr.onerror = function (event) {
+            errorHandler(event);
+
+            if (defaultConfig.onXhrFailure) {
+                defaultConfig.onXhrFailure(xhr, url, event);
+            }
+        };
+
+        xhr.open('GET', url);
+        xhr.send();
+    }
+
+    /**
+     * Main method used by RequireJs.
+     *
+     * @param {String} name - has format: some.module.filext!strip
+     * @param {Function} req
+     * @param {Function|undefined} onLoad
+     */
+    function loadContent(name, req, onLoad) {
+
+        var toStrip = stripReg.test(name),
+            url = req.toUrl(name.replace(stripReg, '')),
+            headers = defaultConfig.headers;
+
+        getContent(url, function (content) {
+                content = toStrip ? stripContent(content) : content;
+                onLoad(content);
+            }, onLoad.error, headers);
+    }
+
+    return {
+        load: loadContent,
+        get: getContent
+    };
+});