Brion VIBBER has submitted this change and it was merged.

Change subject: Support hiding edit button for anon users
......................................................................


Support hiding edit button for anon users

Based on remoteConfig - if it is tweaked to be 'true' then
anon users won't be getting edit buttons in a day or so.

Change-Id: I956d77190035742528e432cca14483cf0995aa1a
---
M wikipedia/assets/bundle-test.js
M wikipedia/assets/bundle.js
M wikipedia/assets/styles.css
M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
M www/js/main.js
M www/less/ui.less
6 files changed, 28 insertions(+), 1 deletion(-)

Approvals:
  Brion VIBBER: Looks good to me, approved



diff --git a/wikipedia/assets/bundle-test.js b/wikipedia/assets/bundle-test.js
index 998db1f..18114f7 100644
--- a/wikipedia/assets/bundle-test.js
+++ b/wikipedia/assets/bundle-test.js
@@ -59,6 +59,10 @@
     bridge.sendMessage( "imagesListResponse", { "images": imageURLs });
 } );
 
+bridge.registerListener( "hideEditButtons", function() {
+    document.getElementsByTagName( "html" )[0].classList.add( "no-editing" );
+} );
+
 },{"./bridge":1}],3:[function(require,module,exports){
 /**
  * MIT LICENSCE
diff --git a/wikipedia/assets/bundle.js b/wikipedia/assets/bundle.js
index 44c8036..40a1a11 100644
--- a/wikipedia/assets/bundle.js
+++ b/wikipedia/assets/bundle.js
@@ -107,6 +107,10 @@
     bridge.sendMessage( "imagesListResponse", { "images": imageURLs });
 } );
 
+bridge.registerListener( "hideEditButtons", function() {
+    document.getElementsByTagName( "html" )[0].classList.add( "no-editing" );
+} );
+
 },{"./bridge":2}],5:[function(require,module,exports){
 var bridge = require("./bridge");
 
diff --git a/wikipedia/assets/styles.css b/wikipedia/assets/styles.css
index 958ffa6..04d850d 100644
--- a/wikipedia/assets/styles.css
+++ b/wikipedia/assets/styles.css
@@ -114,6 +114,9 @@
   float: right;
   display: inline-float;
 }
+.no-editing .edit_section_button {
+  display: none;
+}
 .content-rtl a.edit_section_button {
   float: left;
   /* Flip it! */
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java 
b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
index 8734b22..2cdd6f3 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java
@@ -132,6 +132,8 @@
             throw new RuntimeException("No PageTitle passed in to constructor 
or in instanceState");
         }
 
+        app = (WikipediaApp)getActivity().getApplicationContext();
+
         webView = (ObservableWebView) 
getView().findViewById(R.id.page_web_view);
         loadProgress = (ProgressBar) 
getView().findViewById(R.id.page_load_progress);
         networkError = getView().findViewById(R.id.page_error);
@@ -150,7 +152,6 @@
         Utils.addUtilityMethodsToBridge(getActivity(), bridge);
         Utils.setupDirectionality(title.getSite().getLanguage(), 
Locale.getDefault().getLanguage(), bridge);
         linkHandler = new LinkHandler(getActivity(), bridge, title.getSite());
-        app = (WikipediaApp)getActivity().getApplicationContext();
         api = 
((WikipediaApp)getActivity().getApplicationContext()).getAPIForSite(title.getSite());
 
         retryButton.setOnClickListener(new View.OnClickListener() {
@@ -190,6 +191,11 @@
                 }
             }
         });
+        if (app.getRemoteConfig().getConfig().has("disableAnonEditing")
+                && 
app.getRemoteConfig().getConfig().optBoolean("disableAnonEditing")
+                && !app.getUserInfoStorage().isLoggedIn()) {
+            bridge.sendMessage("hideEditButtons", new JSONObject());
+        }
     }
 
     @Override
diff --git a/www/js/main.js b/www/js/main.js
index ceceb75..a8f5464 100644
--- a/www/js/main.js
+++ b/www/js/main.js
@@ -19,3 +19,7 @@
     }
     bridge.sendMessage( "imagesListResponse", { "images": imageURLs });
 } );
+
+bridge.registerListener( "hideEditButtons", function() {
+    document.getElementsByTagName( "html" )[0].classList.add( "no-editing" );
+} );
diff --git a/www/less/ui.less b/www/less/ui.less
index d6e6ab0..25dcbd7 100644
--- a/www/less/ui.less
+++ b/www/less/ui.less
@@ -7,6 +7,12 @@
     display: inline-float;
 }
 
+.no-editing {
+    .edit_section_button {
+        display: none;
+    }
+}
+
 .content-rtl a.edit_section_button {
     float: left;
     /* Flip it! */

-- 
To view, visit https://gerrit.wikimedia.org/r/125332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I956d77190035742528e432cca14483cf0995aa1a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to