Merge branch 'master' of https://github.com/sokokaleb/jquery.facedete…

…ction into sokokaleb-master
jaysalvat · Nov 4, 2017 · bfe4979 · bfe4979
2 parents f198bfe + 6bf3336
commit bfe4979
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 77 deletions.
diff --git a/README.md b/README.md
@@ -32,8 +32,8 @@ Download the plugin with the method of your choice.
 
 Include [jQuery](http://code.jquery.com/jquery-1.11.1.min.js) and the plugin.
 
-    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script> 
-    <script src="path/to/dist/jquery.facedetection.min.js"></script> 
+    <script src="http://code.jquery.com/jquery-1.11.1.min.js"></script>
+    <script src="path/to/dist/jquery.facedetection.min.js"></script>
 
 Set a picture with some faces in your HTML page.
 
@@ -47,7 +47,7 @@ Apply the plugin to this image and get the face coordinates.
                 console.log(faces);
             }
         });
-    </script> 
+    </script>
 
 Results
 -------
@@ -78,10 +78,9 @@ Settings
         complete: function (faces) {
             // ...
         }
-    
+
 - **error** — Callback function trigged on errors
 
         error: function (code, message) {
             // ...
         }
-        
diff --git a/dist/jquery.facedetection.js b/dist/jquery.facedetection.js
@@ -16246,7 +16246,8 @@
                             name: funct.toString(),
                             shared: scope.shared,
                             id: i,
-                            worker: params.worker_num
+                            worker: params.worker_num,
+                            from: "jquery.facedetection"
                         };
                         try {
                             worker.postMessage(msg);
@@ -16493,15 +16494,27 @@
                 post: post
             };
         })
-    };
+    }, originalOnMessage = window.onmessage || function() {};
     onmessage = function(event) {
-        var data = "string" == typeof event.data ? JSON.parse(event.data) : event.data, scope = {
-            shared: data.shared
-        }, result = parallable.core[data.name].apply(scope, [ data.input, data.id, data.worker ]);
+        var data;
         try {
-            postMessage(result);
+            if (data = "string" == typeof event.data ? JSON.parse(event.data) : event.data, 
+            "jquery.facedetection" === data.type) {
+                var scope = {
+                    shared: data.shared
+                }, result = parallable.core[data.name].apply(scope, [ data.input, data.id, data.worker ]);
+                try {
+                    postMessage(result);
+                } catch (e) {
+                    postMessage(JSON.stringify(result));
+                }
+            } else {
+                var args = Array.prototype.slice.call(arguments);
+                originalOnMessage.apply(window, args);
+            }
         } catch (e) {
-            postMessage(JSON.stringify(result));
+            var args = Array.prototype.slice.call(arguments);
+            originalOnMessage.apply(window, args);
         }
     }, $.fn.faceDetection = function(settingsOrCallback) {
         "use strict";

diff --git a/dist/jquery.facedetection.min.js b/dist/jquery.facedetection.min.js
diff --git a/dist/jquery.facedetection.min.js.map b/dist/jquery.facedetection.min.js.map
diff --git a/package.bk.json b/package.bk.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jquery.facedetection",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A jQuery plugin to detect faces on images, videos and canvases.",
   "homepage": "http://facedetection.jaysalvat.com",
   "main": "./dist/jquery.facedetection.min.js",

diff --git a/src/ccv.js b/src/ccv.js
@@ -32,7 +32,7 @@ if (parallable === undefined) {
 		"use strict";
 
 		parallable.core[funct.toString()] = funct().core;
-		
+
 		return function () {
 			var i;
 			var async, worker_num, params;
@@ -79,7 +79,8 @@ if (parallable === undefined) {
 									"name" : funct.toString(),
 									"shared" : scope.shared,
 									"id" : i,
-									"worker" : params.worker_num };
+									"worker" : params.worker_num,
+                  "from" : "jquery.facedetection" };
 						try {
 							worker.postMessage(msg);
 						} catch (e) {
@@ -481,13 +482,30 @@ var ccv = {
 	})
 }
 
+// Monkey patch to avoid overriding window's onmessage handler.
+var originalOnMessage = window.onmessage || function () {};
 onmessage = function (event) {
-	var data = (typeof event.data == "string") ? JSON.parse(event.data) : event.data;
-	var scope = { "shared" : data.shared };
-	var result = parallable.core[data.name].apply(scope, [data.input, data.id, data.worker]);
-	try {
-		postMessage(result);
-	} catch (e) {
-		postMessage(JSON.stringify(result));
-	}
-}
+  var data;
+  try {
+    data = (typeof event.data == "string") ? JSON.parse(event.data) : event.data;
+    if (data.type === "jquery.facedetection") {
+      // This is the event that is intended for jquery.facedetection
+      var scope = { "shared" : data.shared };
+      var result = parallable.core[data.name].apply(scope, [data.input, data.id, data.worker]);
+      try {
+        postMessage(result);
+      } catch (e) {
+        postMessage(JSON.stringify(result));
+      }
+    } else {
+      // Nope. This is not the event that should be handled by jquery.facedetection
+      var args = Array.prototype.slice.call(arguments);
+      originalOnMessage.apply(window, args);
+    }
+  } catch (e) {
+    // `event.data` is string, but too bad it is not in JSON format.
+    // so just pass it to window's original onmessage handler
+    var args = Array.prototype.slice.call(arguments);
+    originalOnMessage.apply(window, args);
+  }
+}