Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 37617200C39 for ; Thu, 2 Mar 2017 04:11:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 3622F160B70; Thu, 2 Mar 2017 03:11:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 68869160B7F for ; Thu, 2 Mar 2017 04:11:48 +0100 (CET) Received: (qmail 14237 invoked by uid 500); 2 Mar 2017 03:11:47 -0000 Mailing-List: contact commits-help@weex.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@weex.incubator.apache.org Delivered-To: mailing list commits@weex.incubator.apache.org Received: (qmail 14216 invoked by uid 99); 2 Mar 2017 03:11:47 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 03:11:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 981D41A027D for ; Thu, 2 Mar 2017 03:11:46 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.567 X-Spam-Level: X-Spam-Status: No, score=-6.567 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, SPF_NEUTRAL=0.652] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id pnyMlZtbs4wv for ; Thu, 2 Mar 2017 03:11:45 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 84FE85F2C5 for ; Thu, 2 Mar 2017 03:11:45 +0000 (UTC) Received: (qmail 14209 invoked by uid 99); 2 Mar 2017 03:11:45 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Mar 2017 03:11:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D5FC9DFE1E; Thu, 2 Mar 2017 03:11:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cxfeng@apache.org To: commits@weex.incubator.apache.org Date: Thu, 02 Mar 2017 03:11:44 -0000 Message-Id: <9a9a9632075a4196a24d74622b84b11c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-weex git commit: * [ios] bugfix moduleEvent archived-at: Thu, 02 Mar 2017 03:11:49 -0000 Repository: incubator-weex Updated Branches: refs/heads/0.11-dev 33a6c1e8d -> 2f7dd8ab6 * [ios] bugfix moduleEvent Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/82fd327e Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/82fd327e Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/82fd327e Branch: refs/heads/0.11-dev Commit: 82fd327eb053a3af25963d23ca6eaf08b2e55a31 Parents: fa1c8b0 Author: acton393 Authored: Wed Mar 1 14:29:16 2017 +0800 Committer: acton393 Committed: Wed Mar 1 14:29:16 2017 +0800 ---------------------------------------------------------------------- ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/82fd327e/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m index 35e9c0f..642c911 100644 --- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m +++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m @@ -439,7 +439,11 @@ typedef enum : NSUInteger { //had not registered yet observer = [NSMutableDictionary new]; [observer setObject:[@{event:[@[callbackInfo] mutableCopy]} mutableCopy] forKey:moduleClassName]; - [_moduleEventObservers addEntriesFromDictionary:observer]; + if (_moduleEventObservers[moduleClassName]) { //support multi event + [_moduleEventObservers[moduleClassName] addEntriesFromDictionary:observer[moduleClassName]]; + }else { + [_moduleEventObservers addEntriesFromDictionary:observer]; + } } else { observer = _moduleEventObservers[moduleClassName]; [[observer objectForKey:event] addObject:callbackInfo];