Merge remote-tracking branch 'upstream/master'

with-route-provider
Tor Hveem 12 years ago
commit d797f4a305
  1. 10
      js/websockets.js

@ -408,16 +408,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
$scope.buffers = models.model.buffers;
$scope.activeBuffer = models.getActiveBuffer
$scope.incrementAge = function () {
models.model.age++;
models.model.cats.push('nouveau chat');
}
$scope.clickS = function () {
$scope.countS = testService.incrementCount();
};
$rootScope.commands = []
$rootScope.models = models;

Loading…
Cancel
Save