Override otr.js so that we can fallback gracefully on IE

ce75bc47 · JC Brand · 3fea9a09 · ce75bc47 · ce75bc47 · ce75bc47
Commit ce75bc47 authored Aug 05, 2014 by JC Brand
12 changed files
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -101,8 +101,7 @@ module.exports = function(grunt) {
        exec('./node_modules/requirejs/bin/r.js -o src/build.js && ' +
             './node_modules/requirejs/bin/r.js -o src/build-no-locales-no-otr.js && ' +
             './node_modules/requirejs/bin/r.js -o src/build-no-otr.js &&' +
-             './node_modules/requirejs/bin/r.js -o src/build-website.js &&' + 
-             './node_modules/requirejs/bin/r.js -o src/build-website-no-otr.js', callback);
+             './node_modules/requirejs/bin/r.js -o src/build-website.js', callback);
    });

    grunt.registerTask('minify', 'Create a new release', ['cssmin', 'jsmin']);

--- a/builds/converse-no-locales-no-otr.min.js
+++ b/builds/converse-no-locales-no-otr.min.js
--- a/builds/converse-no-otr.min.js
+++ b/builds/converse-no-otr.min.js
--- a/builds/converse.min.js
+++ b/builds/converse.min.js
--- a/builds/converse.website.min.js
+++ b/builds/converse.website.min.js
--- a/index.html
+++ b/index.html
@@ -12,14 +12,10 @@
    <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
-    <!-- Only for development: <script data-main="main" src="components/requirejs/require.js"></script> -->
-    <![if IE]>
-        <!-- Disable Off-the-record encryption for IE, which doesn't have a CSPRNG -->
-        <script src="builds/converse.website-no-otr.min.js"></script>
-    <![endif]>
-    <![if !IE]>
-        <script src="builds/converse.website.min.js"></script>
-    <![endif]>
+    <!-- Only for development: 
+    <script src="builds/converse.website.min.js"></script>
+-->
+         <script data-main="main" src="components/requirejs/require.js"></script> 
 </head>

 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">

--- a/main.js
+++ b/main.js
@@ -34,7 +34,7 @@ config = {
        "crypto": "src/crypto",
        "eventemitter": "components/otr/build/dep/eventemitter",
        "moment": "components/momentjs/moment",
-        "otr": "components/otr/build/otr",
+        "otr": "src/otr",
        "converse-dependencies": "src/deps-website"
    },


--- a/non_amd.html
+++ b/non_amd.html
@@ -9,7 +9,7 @@

    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
    <script type="text/javascript" src="components/otr/build/dep/salsa20.js"></script>
-    <script type="text/javascript" src="components/otr/build/dep/bigint.js"></script>
+    <script type="text/javascript" src="src/bigint.js"></script>
    <!-- CryptoJS -->
    <script type="text/javascript" src="components/otr/vendor/cryptojs/core.js"></script>
    <script type="text/javascript" src="components/otr/vendor/cryptojs/enc-base64.js"></script>
@@ -24,7 +24,7 @@
    <script type="text/javascript" src="components/otr/vendor/cryptojs/mode-ctr.js"></script>
    <!-- until here -->
    <script type="text/javascript" src="components/otr/build/dep/eventemitter.js"></script>
-    <script type="text/javascript" src="components/otr/build/otr.js"></script>
+    <script type="text/javascript" src="src/otr.js"></script>
    <script type="text/javascript" src="components/strophe/strophe.js"></script>
    <script type="text/javascript" src="components/strophe.roster/index.js"></script>
    <script type="text/javascript" src="components/strophe.muc/index.js"></script>

--- a/src/build-website-no-otr.js
+++ b/src/build-website-no-otr.js
-({
-    baseUrl: "../",
-    name: "components/almond/almond.js",
-    out: "../builds/converse.website-no-otr.min.js",
-    include: ['main'],
-    tpl: {
-        // Use Mustache style syntax for variable interpolation
-        templateSettings: {
-            evaluate : /\{\[([\s\S]+?)\]\}/g,
-            interpolate : /\{\{([\s\S]+?)\}\}/g
-        }
-    },
-    paths: {
-        "jquery": "components/jquery/dist/jquery",
-        "jed": "components/jed/jed",
-        "locales": "locale/locales",
-        "af": "locale/af/LC_MESSAGES/af",
-        "de": "locale/de/LC_MESSAGES/de",
-        "en": "locale/en/LC_MESSAGES/en",
-        "es": "locale/es/LC_MESSAGES/es",
-        "fr": "locale/fr/LC_MESSAGES/fr",
-        "he": "locale/he/LC_MESSAGES/he",
-        "hu": "locale/hu/LC_MESSAGES/hu",
-        "id": "locale/id/LC_MESSAGES/id",
-        "it": "locale/it/LC_MESSAGES/it",
-        "ja": "locale/ja/LC_MESSAGES/ja",
-        "nl": "locale/nl/LC_MESSAGES/nl",
-        "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR", 
-        "ru": "locale/ru/LC_MESSAGES/ru",
-        "zh": "locale/zh/LC_MESSAGES/zh",
-        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
-        "underscore": "components/underscore/underscore",
-        "backbone": "components/backbone/backbone",
-        "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
-        "backbone.overview": "components/backbone.overview/backbone.overview",
-        "bootstrap": "components/bootstrap/dist/js/bootstrap",                  // XXX: Only required for https://conversejs.org website
-        "jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
-        "strophe": "components/strophe/strophe",
-        "strophe.muc": "components/strophe.muc/index",
-        "strophe.roster": "components/strophe.roster/index",
-        "strophe.vcard": "components/strophe.vcard/index",
-        "strophe.disco": "components/strophe.disco/index",
-        "converse-dependencies": "src/deps-website-no-otr",
-        "moment":"components/momentjs/moment",
-        "converse-templates":"src/templates",
-        "tpl": "components/requirejs-tpl-jcbrand/tpl",
-        "text": "components/requirejs-text/text"
-    }
-})
--- a/src/build-website.js
+++ b/src/build-website.js
@@ -55,7 +55,7 @@
        "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
        "crypto": "src/crypto",
        "eventemitter": "components/otr/build/dep/eventemitter",
-        "otr": "components/otr/build/otr",
+        "otr": "src/otr",
        "converse-dependencies": "src/deps-website",
        "moment":"components/momentjs/moment",
        "converse-templates":"src/templates",

--- a/src/build.js
+++ b/src/build.js
@@ -53,7 +53,7 @@
        "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
        "crypto": "src/crypto",
        "eventemitter": "components/otr/build/dep/eventemitter",
-        "otr": "components/otr/build/otr",
+        "otr": "src/otr",
        "converse-dependencies": "src/deps-full",
        "moment":"components/momentjs/moment",
        "converse-templates":"src/templates",

--- a/src/otr.js
+++ b/src/otr.js