Merge remote-tracking branch 'upstream/master'

js/filters.js

@@ -24,7 +24,7 @@ weechat.filter('toArray', function () {
     };
 });
 
-weechat.filter('irclinky', ['$filter', function($filter) {
+weechat.filter('irclinky', function() {
     return function(text) {
         if (!text) {
             return text;
@@ -36,12 +36,12 @@ weechat.filter('irclinky', ['$filter', function($filter) {
         // "#1" is much more likely to be "number 1" than "IRC channel #1".
         // Thus, we only match channels beginning with a # and having at least one letter in them.
         var channelRegex = /(^|[\s,.:;?!"'()+@-\~%])(#+[^\x00\x07\r\n\s,:]*[a-z][^\x00\x07\r\n\s,:]*)/gmi;
-        // This is SUPER nasty, but ng-click does not work inside a filter, as the markup has to be $compiled first, which is not possible in filter afaik.
-        // Therefore, get the scope, fire the method, and $apply. Yuck. I sincerely hope someone finds a better way of doing this.
-        var substitute = '$1<a href="#" onclick="var $scope = angular.element(event.target).scope(); $scope.openBuffer(\'$2\'); $scope.$apply();">$2</a>';
+        // Call the method we bound to window.openBuffer when we instantiated
+        // the Weechat controller.
+        var substitute = '$1<a href="#" onclick="openBuffer(\'$2\');">$2</a>';
         return text.replace(channelRegex, substitute);
     };
-}]);
+});
 
 weechat.filter('inlinecolour', function() {
     return function(text) {

js/glowingbear.js

@@ -15,6 +15,11 @@ weechat.config(['$compileProvider', function ($compileProvider) {
 weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', '$log', 'models', 'connection', 'notifications', 'utils', 'settings',
     function ($rootScope, $scope, $store, $timeout, $log, models, connection, notifications, utils, settings) {
 
+    window.openBuffer = function(channel) {
+        $scope.openBuffer(channel);
+        $scope.$apply();
+    };
+
     $scope.command = '';
     $scope.themes = ['dark', 'light'];
 

js/inputbar.js

@@ -179,6 +179,15 @@ weechat.directive('inputBar', function() {
                 // Support different browser quirks
                 var code = $event.keyCode ? $event.keyCode : $event.charCode;
 
+                // Safari doesn't implement DOM 3 input events yet as of 8.0.6
+                var altg = $event.getModifierState ? $event.getModifierState('AltGraph') : false;
+
+                // Mac OSX behaves differntly for altgr, so we check for that
+                if (altg) {
+                    // We don't handle any anything with altgr
+                    return false;
+                }
+
                 // reset quick keys display
                 $rootScope.showQuickKeys = false;
 

test/unit/filters.js

@@ -16,11 +16,11 @@ describe('Filters', function() {
         }));
 
         it('should linkify IRC channels', inject(function(irclinkyFilter) {
-            expect(irclinkyFilter('#foo')).toEqual('<a href="#" onclick="var $scope = angular.element(event.target).scope(); $scope.openBuffer(\'#foo\'); $scope.$apply();">#foo</a>');
+            expect(irclinkyFilter('#foo')).toEqual('<a href="#" onclick="openBuffer(\'#foo\');">#foo</a>');
         }));
 
         it('should not mess up IRC channels surrounded by HTML entities', inject(function(irclinkyFilter) {
-            expect(irclinkyFilter('<"#foo">')).toEqual('<"<a href="#" onclick="var $scope = angular.element(event.target).scope(); $scope.openBuffer(\'#foo">\'); $scope.$apply();">#foo"></a>');
+            expect(irclinkyFilter('<"#foo">')).toEqual('<"<a href="#" onclick="openBuffer(\'#foo">\');">#foo"></a>');
         }));
     });