Also assemble the contents in the preLink-function

l-merge-prefix
Lorenz Hübschle-Schneider 11 years ago
parent 093a6f0fa7
commit 4e1ccec7be
  1. 1
      directives/bufferline.html
  2. 24
      js/glowingbear.js

@ -6,5 +6,4 @@
<td class="prefix"><a ng-click="addMention(bufferline.prefix)"></a></td> <td class="prefix"><a ng-click="addMention(bufferline.prefix)"></a></td>
<td class="message"> <td class="message">
<div ng-repeat="metadata in bufferline.metadata" plugin data="metadata"></div> <div ng-repeat="metadata in bufferline.metadata" plugin data="metadata"></div>
<span ng-repeat="part in bufferline.content" class="text" bo-class="part.classes" bo-html="part.text|irclinky:'_blank'"></span>
</td> </td>

@ -1246,20 +1246,36 @@ weechat.directive('bufferLine', function() {
link: { link: {
pre: function preLink(scope, iElement, iAttrs, controller) { pre: function preLink(scope, iElement, iAttrs, controller) {
var prefix = ""; var prefix = "";
for (var partNum in scope.bufferline.prefix) { var part, partNum, classNum;
var part = scope.bufferline.prefix[partNum]; for (partNum in scope.bufferline.prefix) {
part = scope.bufferline.prefix[partNum];
prefix = angular.element("<span>" + part.text + "</span>"); prefix = angular.element("<span>" + part.text + "</span>");
for (var classNum in part.classes) { for (classNum in part.classes) {
prefix.addClass(part.classes[classNum]); prefix.addClass(part.classes[classNum]);
} }
iElement.find('td.prefix a').append(prefix); iElement.find('td.prefix a').append(prefix);
} }
var content;
for (partNum in scope.bufferline.content) {
part = scope.bufferline.content[partNum];
content = scope.irclinky(part.text);
prefix = angular.element('<span class="text">' + content + '</span>');
for (classNum in part.classes) {
prefix.addClass(part.classes[classNum]);
}
iElement.find('td.message').append(prefix);
}
} }
}, },
controller: function($rootScope, $scope) { controller: function($rootScope, $scope, $filter) {
// pass through the nick click action // pass through the nick click action
$scope.addMention = $rootScope.addMention; $scope.addMention = $rootScope.addMention;
$scope.irclinky = function(text) {
return $filter('irclinky')(text, '_blank');
};
} }
}; };

Loading…
Cancel
Save