Mhurd has submitted this change and it was merged. Change subject: Fix RTL edit pencil for iOS ......................................................................
Fix RTL edit pencil for iOS Needed to use consistent style classes with Android app. Bug: 67611 Change-Id: I25e643d59011bb03b99da9e44f19556d618d0032 --- M wikipedia/View Controllers/WebView/WebViewController.m M wikipedia/assets/bundle.js M wikipedia/assets/index.html M www/index.html M www/js/listeners.js 5 files changed, 15 insertions(+), 9 deletions(-) Approvals: Mhurd: Verified; Looks good to me, approved diff --git a/wikipedia/View Controllers/WebView/WebViewController.m b/wikipedia/View Controllers/WebView/WebViewController.m index 1ab10f4..c9c6467 100644 --- a/wikipedia/View Controllers/WebView/WebViewController.m +++ b/wikipedia/View Controllers/WebView/WebViewController.m @@ -1604,6 +1604,7 @@ [SessionSingleton sharedInstance].currentArticleTitle = article.title; [SessionSingleton sharedInstance].currentArticleDomain = article.domain; MWLanguageInfo *languageInfo = [MWLanguageInfo languageInfoForCode:article.domain]; + NSString *uidir = ([WikipediaAppUtils isDeviceLanguageRTL] ? @"rtl" : @"ltr"); NSNumber *langCount = article.languagecount; NSDate *lastModified = article.lastmodified; @@ -1670,7 +1671,8 @@ [self.bridge sendMessage: @"setLanguage" withPayload: @{ @"lang": languageInfo.code, - @"dir": languageInfo.dir + @"dir": languageInfo.dir, + @"uidir": uidir }]; [self.bridge sendMessage:@"append" withPayload:@{@"html": htmlStr}]; diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js index f0f7d23..06207d6 100644 --- a/wikipedia/assets/bundle.js +++ b/wikipedia/assets/bundle.js @@ -101,9 +101,11 @@ //TODO: move makeTablesNotBlockIfSafeToDoSo, hideAudioTags and reduceWeirdWebkitMargin out into own js object. bridge.registerListener( "setLanguage", function( payload ){ - var body = document.querySelector( "body" ); - body.lang = payload.lang; - body.dir = payload.dir; + var html = document.querySelector( "html" ); + html.lang = payload.lang; + html.dir = payload.dir; + html.classList.add( 'content-' + payload.dir ); + html.classList.add( 'ui-' + payload.uidir ); document.querySelector('base').href = 'https://' + payload.lang + '.wikipedia.org/'; } ); diff --git a/wikipedia/assets/index.html b/wikipedia/assets/index.html index a207b8b..fa2661b 100644 --- a/wikipedia/assets/index.html +++ b/wikipedia/assets/index.html @@ -1,4 +1,4 @@ -<html class="content-ltr ui-ltr" dir="ltr"> +<html> <head> <script src="bundle.js"></script> diff --git a/www/index.html b/www/index.html index a207b8b..fa2661b 100644 --- a/www/index.html +++ b/www/index.html @@ -1,4 +1,4 @@ -<html class="content-ltr ui-ltr" dir="ltr"> +<html> <head> <script src="bundle.js"></script> diff --git a/www/js/listeners.js b/www/js/listeners.js index a2fef82..8373884 100644 --- a/www/js/listeners.js +++ b/www/js/listeners.js @@ -5,9 +5,11 @@ //TODO: move makeTablesNotBlockIfSafeToDoSo, hideAudioTags and reduceWeirdWebkitMargin out into own js object. bridge.registerListener( "setLanguage", function( payload ){ - var body = document.querySelector( "body" ); - body.lang = payload.lang; - body.dir = payload.dir; + var html = document.querySelector( "html" ); + html.lang = payload.lang; + html.dir = payload.dir; + html.classList.add( 'content-' + payload.dir ); + html.classList.add( 'ui-' + payload.uidir ); document.querySelector('base').href = 'https://' + payload.lang + '.wikipedia.org/'; } ); -- To view, visit https://gerrit.wikimedia.org/r/150639 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I25e643d59011bb03b99da9e44f19556d618d0032 Gerrit-PatchSet: 1 Gerrit-Project: apps/ios/wikipedia Gerrit-Branch: master Gerrit-Owner: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Mhurd <mh...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits