Merge pull request #1 from glowing-bear/master

Get up to daite with main repo

js/glowingbear.js

@@ -104,8 +104,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     })();
 
     // Show a TLS warning if GB was loaded over an unencrypted connection,
-    // except for local instances (testing, cordova, or electron)
+    // except for local instances (local files, testing, cordova, or electron)
-    $scope.show_tls_warning = (window.location.protocol !== "https:") &&
+    $scope.show_tls_warning = (["https:", "file:"].indexOf(window.location.protocol) === -1) &&
         (["localhost", "127.0.0.1", "::1"].indexOf(window.location.hostname) === -1) &&
         !window.is_electron && !utils.isCordova();
 

js/irc-utils.js

@@ -119,7 +119,7 @@ IrcUtils.service('IrcUtils', [function() {
             suf = ':';
         }
         // addSpace defaults to true
-        var addSpaceChar = (addSpace === undefined || addSpace === true) ? ' ' : '';
+        var addSpaceChar = (addSpace === undefined || addSpace === 'on') ? ' ' : '';
 
         // new nick list to search in
         var searchNickList = _ciNickList(nickList);

js/plugins.js

@@ -534,24 +534,6 @@ plugins.factory('userPlugins', function() {
         }
     });
 
-    /*
-     * Vine plugin
-     */
-    var vinePlugin = new UrlPlugin('Vine', function (url) {
-        var regexp = /^https?:\/\/(www\.)?vine\.co\/v\/([a-zA-Z0-9]+)(\/.*)?/i,
-            match = url.match(regexp);
-        if (match) {
-            var id = match[2], embedurl = "https://vine.co/v/" + id + "/embed/simple?audio=1";
-            var element = angular.element('<iframe></iframe>')
-                                 .addClass('vine-embed')
-                                 .attr('src', embedurl)
-                                 .attr('width', '600')
-                                 .attr('height', '600')
-                                 .attr('frameborder', '0');
-            return element.prop('outerHTML') + '<script async src="https://platform.vine.co/static/scripts/embed.js" charset="utf-8"></script>';
-        }
-    });
-
     /*
      * Streamable Embedded Player
      */
@@ -570,7 +552,7 @@ plugins.factory('userPlugins', function() {
     });
 
     return {
-        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, vinePlugin, streamablePlugin]
+        plugins: [youtubePlugin, dailymotionPlugin, allocinePlugin, imagePlugin, videoPlugin, audioPlugin, spotifyPlugin, cloudmusicPlugin, googlemapPlugin, asciinemaPlugin, yrPlugin, gistPlugin, pastebinPlugin, giphyPlugin, tweetPlugin, streamablePlugin]
     };
 
 

test/unit/plugins.js

@@ -169,14 +169,5 @@ describe('filter', function() {
             plugins);
         }));
 
-        it('should recognize vines', inject(function(plugins) {
-            expectTheseMessagesToContain([
-                'https://vine.co/v/hWh262H9HM5',
-                'https://vine.co/v/hWh262H9HM5/embed',
-            ],
-            'Vine',
-            plugins);
-        }));
-
     });
 });