commit c1e1b3521437d23cbfe99004552c1f2f6ead014f
author David Pursehouse <dpursehouse@collab.net> Sat Mar 02 06:04:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Mar 02 06:04:22 2019 +0000
tree 3304191195b487a2dbd11b1023d9995e5d2c78d0
parent a1e90af6cb9c760aa91b6ea5bfb66cc9ee319900
parent e2713d5e234b28d0614e9c62c50faffa4635a75a

Merge "Fix preference retrieval" into stable-2.16

src/main/resources/static/emoticons.js

diff --git a/src/main/resources/static/emoticons.js b/src/main/resources/static/emoticons.js
index 1a29d94..996487d 100644
--- a/src/main/resources/static/emoticons.js
+++ b/src/main/resources/static/emoticons.js
@@ -13,12 +13,21 @@
 // limitations under the License.
 
 Gerrit.install(function(self) {
+
+    function get(url, callback) {
+      if (window.Polymer) {
+        self.restApi().get(url).then(callback)
+      } else {
+        Gerrit.get(url, callback)
+      }
+    }
+
     function onComment(e) {
       var prefs = getPrefsFromCookie();
       if (prefs !== null) {
         insertEmoticons(e, prefs)
       } else {
-        self.get('/accounts/self/' + self.getPluginName()
+        get('/accounts/self/' + self.getPluginName()
             + '~preference', function(prefs) {
           storePrefsInCookie(prefs);
           insertEmoticons(e, prefs)