masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #153 from lorenzhs/fixirclinks 

IRC linky: don't match HTML encoded chars (), >, etc.)
This commit is contained in:
David Cormier 2014-02-17 20:36:11 -05:00
parent 0bfbd3eb0b c490e33898
commit dcd6b18115
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/glowingbear.js
View File

@ -26,7 +26,10 @@ weechat.filter('irclinky', ['$filter', function($filter) {
// This regex should be accurate enough. Theoretically, a bunch of other characters is allowed as well // This regex should be accurate enough. Theoretically, a bunch of other characters is allowed as well
// (ASCII except for NULL, BELL, CR, LF, ' ', ',', and ':') and a channel could in theory start with // (ASCII except for NULL, BELL, CR, LF, ' ', ',', and ':') and a channel could in theory start with
// \![A-Z0-9]{5} and then have up to 45 other characters. I doubt anyone uses that. // \![A-Z0-9]{5} and then have up to 45 other characters. I doubt anyone uses that.
var channelRegex = /(^|\s)([#&+][a-z0-9-_]{1,49})/gmi; // Not matching channels beginning with an "&" here because that would also match HTML encoded chars
// (e.g. ) -- if someone feels like modifying the regex to match these channels, but not the HTML
// character codes, please feel free to fix this)
var channelRegex = /(^|\s)([#+][a-z0-9-_]{1,49})/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. // 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. // Therefore, get the scope, fire the method, and $apply. Yuck. I sincerely hope someone finds a better way of doing this.
linkiedText = linkiedText.replace(channelRegex, '$1<a href="#" onclick="var $scope = angular.element(event.target).scope(); $scope.openBuffer(\'$2\'); $scope.$apply();">$2</a>'); linkiedText = linkiedText.replace(channelRegex, '$1<a href="#" onclick="var $scope = angular.element(event.target).scope(); $scope.openBuffer(\'$2\'); $scope.$apply();">$2</a>');