[GitHub] incubator-weex pull request #1220: [WEEX-386][Core] Fix apply default style

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/1220


---

[1/2] incubator-weex git commit: [WEEX-386][Core] Fix apply default style

[kyork]

Repository: incubator-weex
Updated Branches:
  refs/heads/master b25cfd4cc -> 0d960067e


[WEEX-386][Core] Fix apply default style


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ba2a59a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ba2a59a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ba2a59a2

Branch: refs/heads/master
Commit: ba2a59a26c6176afdff17d75eaebc9517f5e22f2
Parents: b25cfd4
Author: miomin 
Authored: Mon May 28 17:48:44 2018 +0800
Committer: miomin 
Committed: Mon May 28 17:52:51 2018 +0800

--
 weex_core/Source/core/render/node/render_appbar.h |  9 +++--
 weex_core/Source/core/render/node/render_object.h | 12 
 2 files changed, 19 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ba2a59a2/weex_core/Source/core/render/node/render_appbar.h
--
diff --git a/weex_core/Source/core/render/node/render_appbar.h 
b/weex_core/Source/core/render/node/render_appbar.h
index 27774fb..9795de6 100644
--- a/weex_core/Source/core/render/node/render_appbar.h
+++ b/weex_core/Source/core/render/node/render_appbar.h
@@ -43,13 +43,18 @@ namespace WeexCore {
   style->insert(std::pair(PADDING_LEFT, "0"));
   style->insert(std::pair(PADDING_RIGHT, "0"));
 
-  if (!appbar_color.empty() && appbar_color != "")
+  if (!appbar_color.empty() && appbar_color != "" && 
!StyleExist(appbar_color))
 style->insert(std::pair(COLOR, 
appbar_color));
-  if (!appbar_background_color.empty() && appbar_background_color != "")
+  if (!appbar_background_color.empty() && appbar_background_color != "" && 
!StyleExist(appbar_background_color))
 style->insert(std::pair(BACKGROUND_COLOR, 
appbar_background_color));
   return style;
 }
 
+inline bool StyleExist(const std::string ) {
+  std::string value = GetStyle(key);
+  return !value.empty() && value != "";
+}
+
   public:
 
 StyleType ApplyStyle(const std::string , const std::string , 
const bool updating) {

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ba2a59a2/weex_core/Source/core/render/node/render_object.h
--
diff --git a/weex_core/Source/core/render/node/render_object.h 
b/weex_core/Source/core/render/node/render_object.h
index c92f4e9..195c798 100644
--- a/weex_core/Source/core/render/node/render_object.h
+++ b/weex_core/Source/core/render/node/render_object.h
@@ -432,6 +432,18 @@ namespace WeexCore {
   }
 }
 
+inline const std::string GetStyle(const std::string ) {
+  if (mStyles == nullptr)
+return "";
+
+  std::map::iterator iter = mStyles->find(key);
+  if (iter != mStyles->end()) {
+return iter->second;
+  } else {
+return "";
+  }
+}
+
 inline void MarkRootRender() {
   mIsRootRender = true;
 }

[2/2] incubator-weex git commit: [WEEX-386][Core] Update libweexcore.so

[kyork]

[WEEX-386][Core] Update libweexcore.so


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/0d960067
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/0d960067
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/0d960067

Branch: refs/heads/master
Commit: 0d960067e1864c981460dfcc40c9f7651840a4ca
Parents: ba2a59a
Author: miomin 
Authored: Mon May 28 17:55:34 2018 +0800
Committer: miomin 
Committed: Mon May 28 17:55:34 2018 +0800

--
 android/sdk/libs/armeabi/libweexcore.so | Bin 644980 -> 644980 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/0d960067/android/sdk/libs/armeabi/libweexcore.so
--
diff --git a/android/sdk/libs/armeabi/libweexcore.so 
b/android/sdk/libs/armeabi/libweexcore.so
index cb2c4b0..2de9e8b 100644
Binary files a/android/sdk/libs/armeabi/libweexcore.so and 
b/android/sdk/libs/armeabi/libweexcore.so differ

[GitHub] incubator-weex issue #1220: [WEEX-386][Core] Fix apply default style

[weex-bot]

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1220
  






  

  
  Messages

  
  
  :book:
  has no jsfm file changed.

  

  :book:
  jsfm test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1220: [WEEX-386][Core] Fix apply default style

[miomin]

GitHub user miomin opened a pull request:

https://github.com/apache/incubator-weex/pull/1220

[WEEX-386][Core] Fix apply default style



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/miomin/incubator-weex master-appbar-fix

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1220.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1220


commit ba2a59a26c6176afdff17d75eaebc9517f5e22f2
Author: miomin 
Date:   2018-05-28T09:48:44Z

[WEEX-386][Core] Fix apply default style

commit 0d960067e1864c981460dfcc40c9f7651840a4ca
Author: miomin 
Date:   2018-05-28T09:55:34Z

[WEEX-386][Core] Update libweexcore.so




---

[GitHub] incubator-weex pull request #1219: [jsfm] Upgrade js framework to v0.26.8

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/1219


---

[4/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8 (resolve #1219)

[hanks]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b25cfd4c/android/sdk/assets/weex-main-jsfm.js
--
diff --git a/android/sdk/assets/weex-main-jsfm.js 
b/android/sdk/assets/weex-main-jsfm.js
index 6fcc970..c304d8a 100644
--- a/android/sdk/assets/weex-main-jsfm.js
+++ b/android/sdk/assets/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.7, 
Build 2018-05-24 15:33. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");var 
global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof
 exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
t,c,r,l;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,l=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[3/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8 (resolve #1219)

[hanks]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b25cfd4c/android/sdk/assets/weex-rax-api.js
--
diff --git a/android/sdk/assets/weex-rax-api.js 
b/android/sdk/assets/weex-rax-api.js
index 597368a..c082123 100644
--- a/android/sdk/assets/weex-rax-api.js
+++ b/android/sdk/assets/weex-rax-api.js
@@ -1,2 +1,2 @@
-var global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().toFixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof
 e&!==e};e.exports.LISTENERS=r("lis
 
teners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[1/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8 (resolve #1219) [Forced Update!]

[hanks]

Repository: incubator-weex
Updated Branches:
  refs/heads/master 38ea9d8a0 -> b25cfd4cc (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b25cfd4c/pre-build/weex-rax-api.js
--
diff --git a/pre-build/weex-rax-api.js b/pre-build/weex-rax-api.js
index 597368a..c082123 100644
--- a/pre-build/weex-rax-api.js
+++ b/pre-build/weex-rax-api.js
@@ -1,2 +1,2 @@
-var global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().toFixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof
 e&!==e};e.exports.LISTENERS=r("lis
 
teners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[2/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8 (resolve #1219)

[hanks]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b25cfd4c/pre-build/weex-main-jsfm.js
--
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index 6fcc970..c304d8a 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.7, 
Build 2018-05-24 15:33. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");var 
global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof
 exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
t,c,r,l;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,l=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[5/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8 (resolve #1219)

[hanks]

* [jsfm] upgrade js framework to v0.26.8 (resolve #1219)


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b25cfd4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b25cfd4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b25cfd4c

Branch: refs/heads/master
Commit: b25cfd4ccec37a55b1e795eda29e260504df30fc
Parents: 74a73cd
Author: Hanks 
Authored: Mon May 28 16:02:01 2018 +0800
Committer: Hanks 
Committed: Mon May 28 16:28:29 2018 +0800

--
 android/sdk/assets/weex-main-jsfm.js | 2 +-
 android/sdk/assets/weex-rax-api.js   | 2 +-
 pre-build/weex-main-jsfm.js  | 2 +-
 pre-build/weex-rax-api.js| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--

[1/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8

[hanks]

Repository: incubator-weex
Updated Branches:
  refs/heads/master 74a73cd9c -> 38ea9d8a0


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38ea9d8a/pre-build/weex-rax-api.js
--
diff --git a/pre-build/weex-rax-api.js b/pre-build/weex-rax-api.js
index 597368a..c082123 100644
--- a/pre-build/weex-rax-api.js
+++ b/pre-build/weex-rax-api.js
@@ -1,2 +1,2 @@
-var global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().toFixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof
 e&!==e};e.exports.LISTENERS=r("lis
 
teners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[2/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8

[hanks]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38ea9d8a/pre-build/weex-main-jsfm.js
--
diff --git a/pre-build/weex-main-jsfm.js b/pre-build/weex-main-jsfm.js
index 6fcc970..c304d8a 100644
--- a/pre-build/weex-main-jsfm.js
+++ b/pre-build/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.7, 
Build 2018-05-24 15:33. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");var 
global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof
 exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
t,c,r,l;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,l=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[3/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8

[hanks]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38ea9d8a/android/sdk/assets/weex-rax-api.js
--
diff --git a/android/sdk/assets/weex-rax-api.js 
b/android/sdk/assets/weex-rax-api.js
index 597368a..c082123 100644
--- a/android/sdk/assets/weex-rax-api.js
+++ b/android/sdk/assets/weex-rax-api.js
@@ -1,2 +1,2 @@
-var global=this,process={env:{}};!function(e,t){"object"==typeof 
exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
e,t,n=(function(e){e.exports=function(n){var r={};function o(e){if(r[e])return 
r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return 
n[e].call(t.exports,t,t.exports,o),t.l=!0,t.exports}return 
o.m=n,o.c=r,o.d=function(e,t,n){o.o(e,t)||Object.defineProperty(e,t,{configurable:!1,enumerable:!0,get:n})},o.r=function(e){Object.defineProperty(e,"__esModule",{value:!0})},o.n=function(e){var
 t=e&__esModule?function(){return e.default}:function(){return e};return 
o.d(t,"a",t),t},o.o=function(e,t){return 
Object.prototype.hasOwnProperty.call(e,t)},o.p="",o(o.s=22)}([function(e,t,n){var
 r=e.exports.createUniqueKey="undefined"!=typeof 
Symbol?Symbol:function(e){return"[["+e+"_"+Math.random().toFixed(8).slice(2)+"]]"},o=e.exports.isObject=function(e){return"object"==typeof
 e&!==e};e.exports.LISTENERS=r("lis
 
teners"),e.exports.CAPTURE=1,e.exports.BUBBLE=2,e.exports.ATTRIBUTE=3,e.exports.newNode=function(e,t,n){var
 
r=o(n);return{listener:e,kind:t,once:r&(n.once),passive:r&(n.passive),next:null}}},function(e,t,n){var
 
r=n(0),o=n(9),i=n(8),a=r.isObject,u=r.LISTENERS,s=r.CAPTURE,l=r.BUBBLE,c=r.ATTRIBUTE,f=r.newNode,d=o.defineCustomEventTarget,p=i.createEventWrapper,h=i.STOP_IMMEDIATE_PROPAGATION_FLAG,v=i.PASSIVE_LISTENER_FLAG,y="undefined"!=typeof
 window& 0!==window.EventTarget,m=e.exports=function e(){var 
t=arguments;if(!(this instanceof 
e)){if(1===arguments.length&(arguments[0]))return 
d(e,arguments[0]);if(0

[4/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8

[hanks]

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/38ea9d8a/android/sdk/assets/weex-main-jsfm.js
--
diff --git a/android/sdk/assets/weex-main-jsfm.js 
b/android/sdk/assets/weex-main-jsfm.js
index 6fcc970..c304d8a 100644
--- a/android/sdk/assets/weex-main-jsfm.js
+++ b/android/sdk/assets/weex-main-jsfm.js
@@ -1,2 +1,2 @@
-(this.nativeLog||function(e){console.log(e)})("START JS FRAMEWORK 0.26.7, 
Build 2018-05-24 15:33. (Vue: 2.5.13-weex.5, Rax: 0.4.20)");var 
global=this,process={env:{}},setTimeout=global.setTimeout;!function(e,t){"object"==typeof
 exports&&"undefined"!=typeof module?t():"function"==typeof 
define&?define(t):t()}(0,function(){"use strict";var 
t,c,r,l;function e(e){return 
e&__esModule&(e,"default")?e.default:e}function
 n(e,t){return 
e(t={exports:{}},t.exports),t.exports}Array.from||(Array.from=(t=Object.prototype.toString,c=function(e){return"function"==typeof
 e||"[object Function]"===t.call(e)},r=Math.pow(2,53)-1,l=function(e){var 
t,n=(t=Number(e),isNaN(t)?0:0!==t&(t)?(0

[5/5] incubator-weex git commit: * [jsfm] upgrade js framework to v0.26.8

[hanks]

* [jsfm] upgrade js framework to v0.26.8


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/38ea9d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/38ea9d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/38ea9d8a

Branch: refs/heads/master
Commit: 38ea9d8a045a805c34e2044cda09121c0e5d4323
Parents: 74a73cd
Author: Hanks 
Authored: Mon May 28 16:02:01 2018 +0800
Committer: Hanks 
Committed: Mon May 28 16:25:50 2018 +0800

--
 android/sdk/assets/weex-main-jsfm.js | 2 +-
 android/sdk/assets/weex-rax-api.js   | 2 +-
 pre-build/weex-main-jsfm.js  | 2 +-
 pre-build/weex-rax-api.js| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
--

[GitHub] incubator-weex pull request #1218: [WEEX-413] [iOS] Fix when main thread par...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/1218


---

incubator-weex git commit: [WEEX-413] [iOS] Fix when main thread parse transform cause deadlock The problem is because when parsing transform, the component thread wait until main thread finish its wo

[cxfeng]

Repository: incubator-weex
Updated Branches:
  refs/heads/master a816492dc -> 74a73cd9c


[WEEX-413] [iOS] Fix when main thread parse transform cause deadlock
The problem is because when parsing transform, the component thread wait until 
main thread finish its work with  main thread still waiting component thead 
work done.
You can try demo on this 
dotwe.http://dotwe.org/vue/caeb8e370f1ddd7d249263c153ea7694


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/74a73cd9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/74a73cd9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/74a73cd9

Branch: refs/heads/master
Commit: 74a73cd9c936fc2d827000ce9b186587f3eba2b6
Parents: a816492
Author: doumafang 
Authored: Mon May 28 15:55:27 2018 +0800
Committer: doumafang 
Committed: Mon May 28 15:55:27 2018 +0800

--
 ios/sdk/WeexSDK/Sources/Component/WXTransform.m | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/74a73cd9/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
--
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m 
b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
index 0fbf8a8..89c4b9f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTransform.m
@@ -23,6 +23,8 @@
 #import "WXUtility.h"
 #import "WXSDKInstance.h"
 #import "WXConvert.h"
+#import "WXSDKEngine.h"
+#import "WXConfigCenterProtocol.h"
 
 @interface WXTransform()
 
@@ -257,7 +259,18 @@
 SEL method = NSSelectorFromString([NSString 
stringWithFormat:@"parse%@:", [name capitalizedString]]);
 if ([self respondsToSelector:method]) {
 @try {
-[self performSelectorOnMainThread:method withObject:value 
waitUntilDone:YES];
+id configCenter = [WXSDKEngine 
handlerForProtocol:@protocol(WXConfigCenterProtocol)];
+if ([configCenter 
respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
+BOOL parseTransformIfWaitUntilDone = [[configCenter 
configForKey:@"iOS_weex_ext_config.parseTransformIfWaitUntilDone" 
defaultValue:@(NO) isDefault:NULL] boolValue];
+if (parseTransformIfWaitUntilDone) {
+[self performSelectorOnMainThread:method 
withObject:value waitUntilDone:YES];
+}
+else{
+IMP imp = [self methodForSelector:method];
+void (*func)(id, SEL,NSArray *) = (void *)imp;
+func(self, method,value);
+}
+}
 }
 @catch (NSException *exception) {
 WXLogError(@"WXTransform exception:%@", [exception reason]);

[GitHub] incubator-weex issue #1219: [jsfm] Upgrade js framework to v0.26.8

[weex-bot]

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1219
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1219: [jsfm] Upgrade js framework to v0.26.8

[Hanks10100]

GitHub user Hanks10100 opened a pull request:

https://github.com/apache/incubator-weex/pull/1219

[jsfm] Upgrade js framework to v0.26.8

Upgrade weex js framework to v0.26.8.

+ Support using vue dsl for *windmill*.
+ Fix some features of rax dsl for *windmill*.

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/Hanks10100/incubator-weex jsfm-release-0.26

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1219.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1219


commit a5cfcbcc11548801f579d6ebf5468e0754a49dc0
Author: Hanks 
Date:   2018-05-28T08:02:01Z

* [jsfm] upgrade js framework to v0.26.8




---

[GitHub] incubator-weex issue #1218: [WEEX-413] [iOS] Fix when main thread parse tran...

[weex-bot]

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1218
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1218: [WEEX-413] [iOS] Fix when main thread par...

[doumafang]

GitHub user doumafang opened a pull request:

https://github.com/apache/incubator-weex/pull/1218

[WEEX-413] [iOS] Fix when main thread parse transform cause deadlock

The problem is because when parsing transform, the component thread wait 
until main thread finish its work with  main thread still waiting component 
thead work done.
You can try demo on this 
dotwe.http://dotwe.org/vue/caeb8e370f1ddd7d249263c153ea7694



You can merge this pull request into a Git repository by running:

$ git pull https://github.com/doumafang/incubator-weex master

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1218.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1218


commit 74a73cd9c936fc2d827000ce9b186587f3eba2b6
Author: doumafang 
Date:   2018-05-28T07:55:27Z

[WEEX-413] [iOS] Fix when main thread parse transform cause deadlock
The problem is because when parsing transform, the component thread wait 
until main thread finish its work with  main thread still waiting component 
thead work done.
You can try demo on this 
dotwe.http://dotwe.org/vue/caeb8e370f1ddd7d249263c153ea7694




---

[GitHub] incubator-weex pull request #1217: [WEEX-412][Android] support multi vm

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/1217


---

incubator-weex git commit: [WEEX-412][Android] support multi vm

[kyork]

Repository: incubator-weex
Updated Branches:
  refs/heads/master afb5d95c4 -> a816492dc


[WEEX-412][Android] support multi vm

support multi vm

Bug: WEEX-412


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/a816492d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a816492d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a816492d

Branch: refs/heads/master
Commit: a816492dced168c119b63b60edee96018c3d49ad
Parents: afb5d95
Author: 东煜 
Authored: Mon May 28 15:35:06 2018 +0800
Committer: 东煜 
Committed: Mon May 28 15:35:06 2018 +0800

--
 android/sdk/libs/armeabi-v7a/libweexjss.so | Bin 3758908 -> 3758908 bytes
 android/sdk/libs/armeabi/libweexjss.so | Bin 3758908 -> 3758908 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a816492d/android/sdk/libs/armeabi-v7a/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi-v7a/libweexjss.so 
b/android/sdk/libs/armeabi-v7a/libweexjss.so
index dee6022..b9f61f6 100755
Binary files a/android/sdk/libs/armeabi-v7a/libweexjss.so and 
b/android/sdk/libs/armeabi-v7a/libweexjss.so differ

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a816492d/android/sdk/libs/armeabi/libweexjss.so
--
diff --git a/android/sdk/libs/armeabi/libweexjss.so 
b/android/sdk/libs/armeabi/libweexjss.so
index dee6022..b9f61f6 100755
Binary files a/android/sdk/libs/armeabi/libweexjss.so and 
b/android/sdk/libs/armeabi/libweexjss.so differ

[GitHub] incubator-weex issue #1217: [WEEX-412][Android] support multi vm

[weex-bot]

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1217
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1217: [WEEX-412][Android] support multi vm

[Darin726]

GitHub user Darin726 opened a pull request:

https://github.com/apache/incubator-weex/pull/1217

[WEEX-412][Android] support multi vm

[WEEX-412][Android] support multi vm

support multi vm

Bug: WEEX-412


https://issues.apache.org/jira/browse/WEEX-412

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/Darin726/incubator-weex 
ApacheMaster-2018-05-28

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1217.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1217


commit a816492dced168c119b63b60edee96018c3d49ad
Author: 东煜 
Date:   2018-05-28T07:35:06Z

[WEEX-412][Android] support multi vm

support multi vm

Bug: WEEX-412




---

[GitHub] incubator-weex pull request #1216: [Weex-410][iOS] Fix gesture related crash...

[asfgit]

Github user asfgit closed the pull request at:

https://github.com/apache/incubator-weex/pull/1216


---

incubator-weex git commit: [Weex-410][iOS] Add ext config removeEventsOfWXComponentWhenDealloc for fix gesture crash on iOS8

[cxfeng]

Repository: incubator-weex
Updated Branches:
  refs/heads/master 2e9c22b84 -> afb5d95c4


[Weex-410][iOS] Add ext config removeEventsOfWXComponentWhenDealloc for fix 
gesture crash on iOS8


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/afb5d95c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/afb5d95c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/afb5d95c

Branch: refs/heads/master
Commit: afb5d95c45cddeddd2187bb6b2f42b6bea22fb9b
Parents: 2e9c22b
Author: Xiaomin 
Authored: Mon May 28 14:51:11 2018 +0800
Committer: Xiaomin 
Committed: Mon May 28 14:51:11 2018 +0800

--
 ios/sdk/WeexSDK/Sources/Model/WXComponent.mm | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/afb5d95c/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
--
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm 
b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
index 0cf24fa..6cbbb25 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
+++ b/ios/sdk/WeexSDK/Sources/Model/WXComponent.mm
@@ -40,9 +40,13 @@
 #import "WXTracingManager.h"
 #import "WXComponent+Events.h"
 #import "WXComponent+Layout.h"
+#import "WXConfigCenterProtocol.h"
+#import "WXSDKEngine.h"
 
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
 #pragma clang diagnostic ignored "-Wobjc-protocol-method-implementation"
+static BOOL bInited = NO;
+static BOOL bNeedRemoveEvents = YES;
 
 @interface WXComponent () 
 
@@ -149,6 +153,13 @@
 [self _initCompositingAttribute:_attributes];
 [self _handleBorders:styles isUpdating:NO];
 
+if (!bInited) {
+id configCenter = [WXSDKEngine 
handlerForProtocol:@protocol(WXConfigCenterProtocol)];
+if ([configCenter 
respondsToSelector:@selector(configForKey:defaultValue:isDefault:)]) {
+bNeedRemoveEvents = [[configCenter 
configForKey:@"iOS_weex_ext_config.removeEventsOfWXComponentWhenDealloc" 
defaultValue:@(YES) isDefault:NULL] boolValue];
+bInited = YES;
+}
+}
 }
 
 return self;
@@ -239,6 +250,12 @@
 [_panGesture removeTarget:nil action:NULL];
 }
 
+if (bNeedRemoveEvents) {
+if (WX_SYS_VERSION_LESS_THAN(@"9.0")) {
+[self _removeAllEvents];
+}
+}
+
 if (_positionType == WXPositionTypeFixed) {
 [self.weexInstance.componentManager removeFixedComponent:self];
 }

[GitHub] incubator-weex issue #1216: [Weex-410][iOS] Fix gesture related crash on iOS...

[weex-bot]

Github user weex-bot commented on the issue:

https://github.com/apache/incubator-weex/pull/1216
  





  

  
  Warnings

  
  
  :warning:
  No Changelog changes!

  




  

  
  Messages

  
  
  :book:
  danger test finished.

  




  Generated by :no_entry_sign: http://github.com/danger/danger-js/;>dangerJS




---

[GitHub] incubator-weex pull request #1216: [Weex-410][iOS] Fix gesture related crash...

[caixiaomin]

GitHub user caixiaomin opened a pull request:

https://github.com/apache/incubator-weex/pull/1216

[Weex-410][iOS] Fix gesture related crash on iOS8 with config

1. All gesture recognizer delegate added to WXComponent should be set to 
nil on iOS8
2. Provided a config to turn on/off, default is on

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/caixiaomin/incubator-weex 
FixGestureCrashOniOS8

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/incubator-weex/pull/1216.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #1216


commit afb5d95c45cddeddd2187bb6b2f42b6bea22fb9b
Author: Xiaomin 
Date:   2018-05-28T06:51:11Z

[Weex-410][iOS] Add ext config removeEventsOfWXComponentWhenDealloc for fix 
gesture crash on iOS8




---

[GitHub] incubator-weex pull request #1213: [Weex-410][iOS] Fix gesture related crash...

[caixiaomin]

Github user caixiaomin closed the pull request at:

https://github.com/apache/incubator-weex/pull/1213


---