Merge branch 'master' into ImgurDelete

5 years ago · 7ef16a174a
parent 3e38d6d74f 16755b5370
commit 7ef16a174a
5 changed files with 5 additions and 57 deletions
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@ -693,21 +693,6 @@ li.buffer.indent.private a {
    user-select: none;
 }

-.emojione {
-    font-size: inherit;
-    height: 1em;
-    width: 1.1em;
-    min-height: 16px;
-    min-width: 16px;
-    display: inline-block;
-    margin: -.2ex .15em .2ex;
-    line-height: normal;
-    vertical-align: middle;
-}
-img.emojione {
-    width: auto;
-}
-
 .toast {
  position: fixed;
  left: 50%;
--- a/electron.makefile
+++ b/electron.makefile
@ -9,7 +9,6 @@ bower:
 copylocal:
 	find bower_components \( -name "*min.js" -o -name "*min.css" \) -exec cp {} 3rdparty \;
 	cp -r bower_components/bootstrap/fonts .
-	cp bower_components/emojione/assets/sprites/emojione.sprites.svg 3rdparty

 # modify index.html to use local files
 uselocal: copylocal
--- a/index.html
+++ b/index.html
@ -19,10 +19,10 @@
    <link rel="shortcut icon" type="image/png" href="assets/img/favicon.png" >
    <link href="css/glowingbear.css" rel="stylesheet" media="screen">
    <link href="css/themes/dark.css" rel="stylesheet" media="screen" id="themeCSS" />
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular.min.js" integrity="sha256-QRJz3b0/ZZC4ilKmBRRjY0MgnVhQ+RR1tpWLYaRRjSo=" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular-route.min.js" integrity="sha256-PQfkC+TI/HZv0O9JbmrLmPyhgOT2hry24vA5yAV59zY=" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular-sanitize.min.js" integrity="sha256-LLlLr1XzKUXSFI9SiuEJOAn88Dwge+/zld523N2c8+8=" crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.5/angular-touch.min.js" integrity="sha256-4IS2pHNTST2Jl6dSzNsERpYleiQi1r4L2MLPElG8LZ4=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.7.9/angular.min.js" integrity="sha256-b5NvmvUcyr0wpBOLnNbaWH5zKQAivhj8yMYhfXEumQA=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-route/1.7.9/angular-route.min.js" integrity="sha256-WTkeb5AZHX/sDacGSGiF3NX38HvQhfv0U1uilADksXc=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-sanitize/1.7.9/angular-sanitize.min.js" integrity="sha256-nne9nFlD03jNmaV9DT9Ns51XCopbolhNWl8C2s379tU=" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/angular-touch/1.7.9/angular-touch.min.js" integrity="sha256-tqkwQDD7/6S5kru/7UjpaiFx9xbdotmPhVJSNhwsdUM=" crossorigin="anonymous"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.9.1/underscore-min.js" integrity="sha256-G7A4JrJjJlFqP0yamznwPjAApIKPkadeHfyIwiaa9e0=" crossorigin="anonymous"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/emojione/2.2.7/lib/js/emojione.min.js" integrity="sha256-9cBkVeU53NiJ9/BdcJta3HbERAmf5X9DE2WvL8V+gDs=" crossorigin="anonymous"></script>
    <script type="text/javascript" src="3rdparty/inflate.min.js"></script>
@ -415,7 +415,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
              <td class="prefix"><span ng-class="::{'repeated-prefix': bufferline.prefixtext==bufferlines[$index-1].prefixtext}"><a ng-click="addMention(bufferline)"><span class="hidden-bracket" ng-if="::(bufferline.showHiddenBrackets)">&lt;</span><span ng-repeat="part in ::bufferline.prefix" ng-class="::part.classes" ng-bind="::part.text|prefixlimit:25"></span><span class="hidden-bracket" ng-if="::(bufferline.showHiddenBrackets)">&gt;</span></a></span></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.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | conditionalLinkify:part.classes.includes('cof-chat_host') | DOMfilter:'codify' | DOMfilter:'irclinky' | DOMfilter:'emojify':settings.enableJSEmoji | DOMfilter:'inlinecolour' |  DOMfilter:'latexmath':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
+             --><span ng-repeat="part in ::bufferline.content" class="text" ng-class="::part.classes.concat(['line-' + part.$$hashKey.replace(':','_')])" ng-bind-html="::part.text | conditionalLinkify:part.classes.includes('cof-chat_host') | DOMfilter:'codify' | DOMfilter:'irclinky' | DOMfilter:'inlinecolour' |  DOMfilter:'latexmath':('.line-' + part.$$hashKey.replace(':','_')):settings.enableMathjax"></span>
              </td>
            </tr>
            <tr class="readmarker" ng-if="activeBuffer().lastSeen==$index">
@ -590,16 +590,6 @@ npm run build-electron-{windows, darwin, linux}</pre>
                  </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. Emoji provided free by <a href="http://emojione.com">http://emojione.com</a></span>
-                    </label>
-                  </div>
-                </form>
-              </li>
              <li>
                <form class="form-inline" role="form">
                  <div class="checkbox">
--- a/js/filters.js
+++ b/js/filters.js
@ -184,24 +184,6 @@ weechat.filter('getBufferQuickKeys', function () {
    };
 });

-// Emojifis the string using https://github.com/Ranks/emojione
-weechat.filter('emojify', function() {
-    return function(text, enable_JS_Emoji) {
-        if (enable_JS_Emoji === true && window.emojione !== undefined) {
-            // Emoji live in the D800-DFFF surrogate plane; only bother passing
-            // this range to CPU-expensive unicodeToImage();
-            var emojiRegex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
-            if (emojiRegex.test(text)) {
-                return emojione.unicodeToImage(text);
-            } else {
-                return(text);
-            }
-        } else {
-            return(text);
-        }
-    };
-});
-
 weechat.filter('latexmath', function() {
    return function(text, selector, enabled) {
        if (!enabled || typeof(katex) === "undefined") {
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@ -59,7 +59,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
        'fontsize': '14px',
        'fontfamily': (utils.isMobileUi() ? 'sans-serif' : 'Inconsolata, Consolas, Monaco, Ubuntu Mono, monospace'),
        'readlineBindings': false,
-        'enableJSEmoji': !utils.isMobileUi(),
        'enableMathjax': false,
        'enableQuickKeys': true,
        'customCSS': '',
@ -119,13 +118,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
        (["localhost", "127.0.0.1", "::1"].indexOf(window.location.hostname) === -1) &&
        !window.is_electron && !utils.isCordova();

-    if (window.is_electron) {
-        // Use packaged emojione sprite in the electron app
-        emojione.imageType = 'svg';
-        emojione.sprites = true;
-        emojione.imagePathSVGSprites = './3rdparty/emojione.sprites.svg';
-    }
-
    $rootScope.isWindowFocused = function() {
        if (typeof $scope.documentHidden === "undefined") {
            // Page Visibility API not supported, assume yes