Added global.hproseFlashPath support

xiaojian001 · Nov 7, 2016 · c3bde4f · c3bde4f
1 parent 34aaaa7
commit c3bde4f
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "author": "Ma Bingyao <[email protected]>",
     "name": "hprose",
-    "version": "2.0.18",
+    "version": "2.0.19",
     "description": "Hprose is a High Performance Remote Object Service Engine.",
     "keywords": [
         "hprose",

diff --git a/dist/hprose.js b/dist/hprose.js
diff --git a/dist/hprose.min.js b/dist/hprose.min.js
diff --git a/dist/hprose.src.js b/dist/hprose.src.js
@@ -1,4 +1,4 @@
-// Hprose for JavaScript v2.0.18
+// Hprose for JavaScript v2.0.19
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:
@@ -5866,7 +5866,7 @@
  *                                                        *
  * POST data to HTTP Server (using Flash).                *
  *                                                        *
- * LastModified: Oct 23, 2016                             *
+ * LastModified: Nov 7, 2016                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -5892,7 +5892,7 @@
     // get flash path
     var document = global.document;
     var scripts = document.getElementsByTagName('script');
-    var flashpath = scripts[scripts.length - 1].getAttribute('flashpath') || '';
+    var flashpath = scripts[scripts.length - 1].getAttribute('flashpath') || global.hproseFlashPath || '';
     scripts = null;
 
     // static private members

diff --git a/example/hprose.js b/example/hprose.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hprose-js",
   "filename": "hprose.js",
-  "version": "2.0.18",
+  "version": "2.0.19",
   "description": "Hprose is a High Performance Remote Object Service Engine.",
   "homepage": "https://github.com/hprose",
   "license": "MIT",

diff --git a/src/CopyRight.js b/src/CopyRight.js
@@ -1,4 +1,4 @@
-// Hprose for JavaScript v2.0.18
+// Hprose for JavaScript v2.0.19
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:

diff --git a/src/FlashHttpRequest.js b/src/FlashHttpRequest.js
@@ -13,7 +13,7 @@
  *                                                        *
  * POST data to HTTP Server (using Flash).                *
  *                                                        *
- * LastModified: Oct 23, 2016                             *
+ * LastModified: Nov 7, 2016                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -39,7 +39,7 @@
     // get flash path
     var document = global.document;
     var scripts = document.getElementsByTagName('script');
-    var flashpath = scripts[scripts.length - 1].getAttribute('flashpath') || '';
+    var flashpath = scripts[scripts.length - 1].getAttribute('flashpath') || global.hproseFlashPath || '';
     scripts = null;
 
     // static private members

diff --git a/test/hprose.js b/test/hprose.js