Fjalapeno has submitted this change and it was merged.
Change subject: Fix for lock edit pencil showing alert twice.
......................................................................
Fix for lock edit pencil showing alert twice.
T96822
Change-Id: Idd157331df387c4b91356147ac13e9ede7569192
---
M Wikipedia/assets/bundle.js
M www/js/bridge.js
2 files changed, 22 insertions(+), 18 deletions(-)
Approvals:
Fjalapeno: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Wikipedia/assets/bundle.js b/Wikipedia/assets/bundle.js
index 4a429d4..71a91bd 100644
--- a/Wikipedia/assets/bundle.js
+++ b/Wikipedia/assets/bundle.js
@@ -24,16 +24,18 @@
};
Bridge.prototype.sendMessage = function( messageType, payload ) {
- var messagePack = { type: messageType, payload: payload };
- var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify(
messagePack ) );
+ setTimeout(function() { // See: https://phabricator.wikimedia.org/T96822
and http://stackoverflow.com/a/9782220/135557
+ var messagePack = { type: messageType, payload: payload };
+ var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify(
messagePack ) );
- // quick iframe version based on http://stackoverflow.com/a/6508343/82439
- // fixme can this be an XHR instead? check Cordova current state
- var iframe = document.createElement('iframe');
- iframe.setAttribute("src", url);
- document.documentElement.appendChild(iframe);
- iframe.parentNode.removeChild(iframe);
- iframe = null;
+ // quick iframe version based on
http://stackoverflow.com/a/6508343/82439
+ // fixme can this be an XHR instead? check Cordova current state
+ var iframe = document.createElement('iframe');
+ iframe.setAttribute("src", url);
+ document.documentElement.appendChild(iframe);
+ iframe.parentNode.removeChild(iframe);
+ iframe = null;
+ }, 0);
};
module.exports = new Bridge();
diff --git a/www/js/bridge.js b/www/js/bridge.js
index 646d2a9..e0c44b4 100644
--- a/www/js/bridge.js
+++ b/www/js/bridge.js
@@ -23,16 +23,18 @@
};
Bridge.prototype.sendMessage = function( messageType, payload ) {
- var messagePack = { type: messageType, payload: payload };
- var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify(
messagePack ) );
+ setTimeout(function() { // See: https://phabricator.wikimedia.org/T96822
and http://stackoverflow.com/a/9782220/135557
+ var messagePack = { type: messageType, payload: payload };
+ var url = "x-wikipedia-bridge:" + encodeURIComponent( JSON.stringify(
messagePack ) );
- // quick iframe version based on http://stackoverflow.com/a/6508343/82439
- // fixme can this be an XHR instead? check Cordova current state
- var iframe = document.createElement('iframe');
- iframe.setAttribute("src", url);
- document.documentElement.appendChild(iframe);
- iframe.parentNode.removeChild(iframe);
- iframe = null;
+ // quick iframe version based on
http://stackoverflow.com/a/6508343/82439
+ // fixme can this be an XHR instead? check Cordova current state
+ var iframe = document.createElement('iframe');
+ iframe.setAttribute("src", url);
+ document.documentElement.appendChild(iframe);
+ iframe.parentNode.removeChild(iframe);
+ iframe = null;
+ }, 0);
};
module.exports = new Bridge();
--
To view, visit https://gerrit.wikimedia.org/r/206349
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd157331df387c4b91356147ac13e9ede7569192
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
