remove favico and emojify

doesn't make much sense in an app...
11 years ago · b5a4456a37
parent 234deeb800
commit b5a4456a37
5 changed files with 3 additions and 82 deletions
--- a/3rdparty/favico-0.3.5.min.js
+++ b/3rdparty/favico-0.3.5.min.js
--- a/index.html
+++ b/index.html
@ -35,7 +35,6 @@
    <script type="text/javascript" src="js/websockets.js"></script>
    <script type="text/javascript" src="js/models.js"></script>
    <script type="text/javascript" src="js/plugins.js"></script>
-    <script type="text/javascript" src="3rdparty/favico-0.3.5.min.js"></script>
  </head>
  <body ng-controller="WeechatCtrl" ng-keydown="handleKeyPress($event)" ng-keyup="handleKeyRelease($event)"  ng-keypress="handleKeyPress($event)" ng-class="{'no-overflow': connected}" lang="en-US">
    <link ng-href="css/themes/{{settings.theme}}.css" rel="stylesheet" media="screen" />
@ -255,7 +254,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
              <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text"></span></a></td><!--
           --><td class="message"><!--
             --><div ng-repeat="metadata in ::bufferline.metadata" plugin data="::metadata"></div><!--
-             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes" ng-bind-html="::part.text | linky:'_blank' | DOMfilter:'irclinky' | DOMfilter:'emojify':settings.enableJSEmoji | DOMfilter:'inlinecolour' "></span>
+             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes" ng-bind-html="::part.text | linky:'_blank' | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' "></span>
              </td>
            </tr>
            <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
@ -393,16 +392,6 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                  </div>
                </form>
              </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="settings.useFavico">
-                      Display unread count in favicon
-                    </label>
-                  </div>
-                </form>
-              </li>
              <li>
                <form class="form-inline" role="form">
                  <div class="checkbox">
@ -413,16 +402,6 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                  </div>
                </form>
              </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="settings.enableJSEmoji">
-                      Enable non-native Emoji support <span class="text-muted settings-help">Displays Emoji characters as images</span>
-                    </label>
-                  </div>
-                </form>
-              </li>
            </ul>
          </div>
          <div class="modal-footer">
--- a/js/filters.js
+++ b/js/filters.js
@ -139,15 +139,4 @@ weechat.filter('getBufferQuickKeys', function () {
    };
 });

-// Emojifis the string using https://github.com/twitter/twemoji
-weechat.filter('emojify', function() {
-    return function(text, enable_JS_Emoji) {
-        if (enable_JS_Emoji === true) {
-            return twemoji.parse(text);
-        } else {
-            return(text);
-        }
-    };
-});
-
 })();
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@ -35,8 +35,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
        'showtimestampSeconds': false,
        'fontsize': '14px',
        'fontfamily': (utils.isMobileUi() ? 'sans-serif' : 'Inconsolata, Consolas, Monaco, Ubuntu Mono, monospace'),
-        'readlineBindings': false,
-        'enableJSEmoji': false
+        'readlineBindings': false
    });
    $scope.settings = settings;

@ -113,7 +112,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
                    buffer.unread = 0;
                    buffer.notification = 0;

-                    // Trigger title and favico update
+                    // Trigger title update
                    $rootScope.$emit('notificationChanged');
                }

@ -216,14 +215,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
        }
    });

-    $rootScope.favico = new Favico({animation: 'none'});
-
    $rootScope.$on('notificationChanged', function() {
        notifications.updateTitle();
-
-        if (settings.useFavico && $rootScope.favico) {
-            notifications.updateFavico();
-        }
    });

    $rootScope.$on('relayDisconnect', function() {
@ -348,17 +341,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
        $rootScope.predicate = orderbyserver ? 'serverSortKey' : 'number';
    });

-    settings.addCallback('useFavico', function(useFavico) {
-        // this check is necessary as this is called on page load, too
-        if (!$rootScope.connected) {
-            return;
-        }
-        if (useFavico) {
-            notifications.updateFavico();
-        } else {
-            $rootScope.favico.reset();
-        }
-    });

    // Update font family when changed
    settings.addCallback('fontfamily', function(fontfamily) {
@ -642,7 +624,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
            if ($rootScope.connected) {
                $scope.disconnect();
            }
-            $scope.favico.reset();
        }
    };

--- a/js/notifications.js
+++ b/js/notifications.js
@ -57,26 +57,6 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', fu
        }
    };

-    var updateFavico = function() {
-        var notifications = unreadCount('notification');
-        if (notifications > 0) {
-            $rootScope.favico.badge(notifications, {
-                    bgColor: '#d00',
-                    textColor: '#fff'
-            });
-        } else {
-            var unread = unreadCount('unread');
-            if (unread === 0) {
-                $rootScope.favico.reset();
-            } else {
-                $rootScope.favico.badge(unread, {
-                    bgColor: '#5CB85C',
-                    textColor: '#ff0'
-                });
-            }
-        }
-    };
-
    /* Function gets called from bufferLineAdded code if user should be notified */
    var createHighlight = function(buffer, message) {
        var title = '';
@ -154,7 +134,6 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', 'settings', fu
    return {
        requestNotificationPermission: requestNotificationPermission,
        updateTitle: updateTitle,
-        updateFavico: updateFavico,
        createHighlight: createHighlight,
        cancelAll: cancelAll,
    };