Browse Source

[bugfix] Make cgu use httprequestWrapper and compile again

B Thibault 7 years ago
parent
commit
3fb438d358
7 changed files with 49 additions and 45 deletions
  1. 4 1
      Makefile
  2. 1 1
      cli/cgu/main.js
  3. 1 1
      cli/msgFormatter
  4. 0 38
      cli/native.js
  5. 39 0
      cli/nativeCallback.js
  6. 4 2
      srv/public/cgu.min.js
  7. 0 2
      srv/public/mimouchat.min.js

+ 4 - 1
Makefile

@@ -30,6 +30,7 @@ SRC=		srv/src/context.js			\
 			cli/utils.js				\
 			cli/config.js				\
 			cli/rawTCPSocket.js			\
+			cli/nativeCallback.js		\
 			cli/native.js				\
 			\
 			cli/commands/core.js		\
@@ -58,7 +59,9 @@ SRC_CGU=	cli/lang/core.js		\
 			cli/cgu/en.js			\
 			\
 			cli/httpRequest.js		\
-			cli/cgu/main.js
+			cli/nativeCallback.js	\
+			cli/cgu/main.js			\
+			--externs cli/externs/native.js
 
 OUTPUT_CGU=	srv/public/cgu.min.js
 

+ 1 - 1
cli/cgu/main.js

@@ -3,7 +3,7 @@ initLang();
 
 document.getElementById("cguButton").addEventListener("click", function(e) {
     e.preventDefault();
-    new HttpRequest(HttpRequestMethod.PUT, "account/cguAccept")
+    HttpRequestWrapper(HttpRequestMethod.PUT, "account/cguAccept")
         .callbackSuccess(function() {
             document.location.reload();
         })

+ 1 - 1
cli/msgFormatter

@@ -1 +1 @@
-Subproject commit ecf0aaad6b6e0f32bc3c1674e839b116691fd5d6
+Subproject commit febf876d6732cfed2cb0b2be9799868177b5fdc8

+ 0 - 38
cli/native.js

@@ -31,41 +31,3 @@ window["onApplicationResumed"] = function() {
     window.hasFocus = true;
 };
 
-var CALLBACK = (function() {
-    var
-        /** @type {Object<string, Function>} */
-        callbacks = {},
-        /** @type {number} */
-        currentCallbackId = 0;
-
-    /** @type {function(Function, Object=):number} */
-    function makeCallback(fnc, ctx) {
-        var cbId = currentCallbackId++;
-        if (ctx)
-            fnc.ctx = ctx;
-        callbacks['' +cbId] = fnc;
-        return cbId;
-    }
-
-    function triggerCallback() {
-        var id = '' +Array.prototype.shift.call(arguments);
-        if (callbacks[id]) {
-            callbacks[id].apply(callbacks[id].ctx, arguments);
-            delete callbacks[id];
-        }
-    }
-
-    return {
-        /** @type {function(Function, Object=):number} */
-        makeCallback: makeCallback,
-        onCallbackResponse: triggerCallback
-    };
-})();
-
-window["__CALLBACK"] = { "onResult": CALLBACK.onCallbackResponse };
-
-/** @return {boolean} */
-function isNative() {
-    return !!("__native" in window);
-}
-

+ 39 - 0
cli/nativeCallback.js

@@ -0,0 +1,39 @@
+
+var CALLBACK = (function() {
+    var
+        /** @type {Object<string, Function>} */
+        callbacks = {},
+        /** @type {number} */
+        currentCallbackId = 0;
+
+    /** @type {function(Function, Object=):number} */
+    function makeCallback(fnc, ctx) {
+        var cbId = currentCallbackId++;
+        if (ctx)
+            fnc.ctx = ctx;
+        callbacks['' +cbId] = fnc;
+        return cbId;
+    }
+
+    function triggerCallback() {
+        var id = '' +Array.prototype.shift.call(arguments);
+        if (callbacks[id]) {
+            callbacks[id].apply(callbacks[id].ctx, arguments);
+            delete callbacks[id];
+        }
+    }
+
+    return {
+        /** @type {function(Function, Object=):number} */
+        makeCallback: makeCallback,
+        onCallbackResponse: triggerCallback
+    };
+})();
+
+window["__CALLBACK"] = { "onResult": CALLBACK.onCallbackResponse };
+
+/** @return {boolean} */
+function isNative() {
+    return !!("__native" in window);
+}
+

+ 4 - 2
srv/public/cgu.min.js

@@ -1,4 +1,6 @@
 "use strict";(function(){
-var c={},d,f=[];c.fr={b:{cguHeader:"Merci de lire attentivement les Conditions G\u00e9n\u00e9rales d'Utilisation suivantes:",cguContent:"OSEF",cguButton:"J'accepte"}};c.en={b:{cguHeader:"Please read carefully the following terms of services:",cguContent:"OSEF",cguButton:"I accept"}};function h(){this.a=new XMLHttpRequest;this.method="PUT";this.a.onreadystatechange=function(){4===this.a.readyState&&(2===Math.floor(this.a.status/100)?k(this.f,this.a.status,this.a.statusText,this.a.response):k(this.c,this.a.status,this.a.statusText,this.a.response),k(this.g,this.a.status,this.a.statusText,this.a.response))}.bind(this)}function k(a,b,g,e){a&&a.forEach(function(a){a(b,g,e)})}function l(a){var b=new h;b.f||(b.f=[]);b.f.push(a);return b}
-function m(a,b){a.c||(a.c=[]);a.c.push(b);return a}function n(a){a.a.open(a.method,"account/cguAccept",!0);a.a.send(void 0)};(function(a){if(!a){for(var b=0,g=navigator.languages.length;b<g;b++)if(c.hasOwnProperty(navigator.languages[b])){a=navigator.languages[b];break}a||(a="en")}d=c[a];console.log("Loading language pack: "+a);if(d.b)for(var e in d.b)if(a=document.getElementById(e))a.textContent=d.b[e];f.forEach(function(a){a()})})();document.getElementById("cguButton").addEventListener("click",function(a){a.preventDefault();n(m(l(function(){document.location.reload()}),function(){}));return!1});
+var e={},f,g=[];e.fr={f:{cguHeader:"Merci de lire attentivement les Conditions G\u00e9n\u00e9rales d'Utilisation suivantes:",cguContent:"OSEF",cguButton:"J'accepte"}};e.en={f:{cguHeader:"Please read carefully the following terms of services:",cguContent:"OSEF",cguButton:"I accept"}};function h(a,b){this.g=b||a;this.method=b?a:"GET"}function k(a,b,c,d){a&&a.forEach(function(a){a(b,c,d)})}function l(a){var b="__native"in window?new n("PUT","account/cguAccept"):new p("PUT","account/cguAccept");b.c||(b.c=[]);b.c.push(a);return b}function q(a,b){a.b||(a.b=[]);a.b.push(b);return a}
+function p(a,b){h.call(this,a,b);this.a=new XMLHttpRequest;this.a.onreadystatechange=function(){4===this.a.readyState&&(2===Math.floor(this.a.status/100)?k(this.c,this.a.status,this.a.statusText,this.a.response):k(this.b,this.a.status,this.a.statusText,this.a.response),k(this.i,this.a.status,this.a.statusText,this.a.response))}.bind(this)}p.prototype=Object.create(h.prototype);p.prototype.constructor=p;p.prototype.h=function(a){this.a.open(this.method,this.g,!0);this.a.send(a);return this};
+function n(a,b){h.call(this,a,b);this.responseType="text"}n.prototype=Object.create(h.prototype);n.prototype.constructor=p;function r(a){if(!a)return null;if("string"===typeof a)return a;var b={},c;for(c in a)b[c]=a[c];return JSON.stringify(b)}var t=function(){var a=document.createElement("a");return function(b){a.href=b;return a.href}}();
+n.prototype.h=function(a){__native.sendHttpRequest(this.method,t(this.g),5E3,this.responseType,r(a),u.l(function(a,c,d){try{var b="text"===this.responseType?d:JSON.parse(d)}catch(v){b=d}__native.isDebug()&&console.log(this,{s:a,statusText:c,o:d});2===Math.floor(a/100)?k(this.c,a,c,b):k(this.b,a,c,b);k(this.i,a,c,b)},this));return this};var u=function(){var a={},b=0;return{l:function(c,d){var m=b++;d&&(c.j=d);a[""+m]=c;return m},m:function(){var b=""+Array.prototype.shift.call(arguments);a[b]&&(a[b].apply(a[b].j,arguments),delete a[b])}}}();window.__CALLBACK={onResult:u.m};(function(a){if(!a){for(var b=0,c=navigator.languages.length;b<c;b++)if(e.hasOwnProperty(navigator.languages[b])){a=navigator.languages[b];break}a||(a="en")}f=e[a];console.log("Loading language pack: "+a);if(f.f)for(var d in f.f)if(a=document.getElementById(d))a.textContent=f.f[d];g.forEach(function(a){a()})})();document.getElementById("cguButton").addEventListener("click",function(a){a.preventDefault();q(l(function(){document.location.reload()}),function(){}).h();return!1});
 })();

File diff suppressed because it is too large
+ 0 - 2
srv/public/mimouchat.min.js


Some files were not shown because too many files changed in this diff