From 9bfdb32df13953bbb4295ceb4087bc23102bd6ef Mon Sep 17 00:00:00 2001 From: Olivier Louvignes Date: Sat, 31 Oct 2015 11:16:51 +0100 Subject: [PATCH 001/141] chore(npm): update deps --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 3d3f3c352..312318d7d 100644 --- a/package.json +++ b/package.json @@ -29,10 +29,10 @@ "devDependencies": { "codeclimate-test-reporter": "^0.1.1", "del": "^2.0.2", - "eslint": "^1.7.3", + "eslint": "^1.8.0", "eslint-config-airbnb": "^0.1.0", - "factory-angular-channels": "^0.8.9", - "gulp-jshint": "^1.11.2", + "factory-angular-channels": "^0.9.0", + "gulp-jshint": "^1.12.0", "gulp-ng-annotate": "^1.1.0", "gulp-pre": "^4.0.0-alpha.4", "gulp-rename": "^1.2.2", @@ -49,7 +49,7 @@ "ng-factory": "^1.0", "phantomjs": "^1.9.18", "through2": "^2.0.0", - "undertaker-lib-tasks": "^0.4.3" + "undertaker-lib-tasks": "^0.5.1" }, "scripts": { "test": "$(npm bin)/gulp jshint karma:unit" From e72dc4b0a7afe46b7dcb4a73d36de44d4a2e8a27 Mon Sep 17 00:00:00 2001 From: Adam Willoughby-Knox Date: Fri, 16 Oct 2015 10:57:52 -0400 Subject: [PATCH 002/141] docs(navbar): fix typo --- src/navbar/docs/navbar.demo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/navbar/docs/navbar.demo.html b/src/navbar/docs/navbar.demo.html index 2d3e28d61..0d696c1ec 100644 --- a/src/navbar/docs/navbar.demo.html +++ b/src/navbar/docs/navbar.demo.html @@ -30,7 +30,7 @@

Use data-match-route attributes to any children navigation item that should be toggled active.

Heads up!

-

The directives also supports HTML5 mode, you just have to drop the href dashes.

+

The directives also supports HTML5 mode, you just have to drop the hash symbol from the href.

From ee9177d9e8c662baf9d5f4bb4107954a293176a4 Mon Sep 17 00:00:00 2001 From: Nick Nissen Date: Tue, 27 Oct 2015 07:47:42 +0100 Subject: [PATCH 003/141] Fix(bsSelect): bsSelect should rerender when values inside arrays changes Change bsSelect to deep watch bsOptions values. --- src/select/select.js | 4 ++-- src/select/test/select.spec.js | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/select/select.js b/src/select/select.js index 270f6cda3..cd6bdd971 100644 --- a/src/select/select.js +++ b/src/select/select.js @@ -321,14 +321,14 @@ angular.module('mgcrea.ngStrap.select', ['mgcrea.ngStrap.tooltip', 'mgcrea.ngStr // Watch bsOptions values before filtering for changes var watchedOptions = parsedOptions.$match[7].replace(/\|.+/, '').trim(); - scope.$watchCollection(watchedOptions, function(newValue, oldValue) { + scope.$watch(watchedOptions, function(newValue, oldValue) { // console.warn('scope.$watch(%s)', watchedOptions, newValue, oldValue); parsedOptions.valuesFn(scope, controller) .then(function(values) { select.update(values); controller.$render(); }); - }); + }, true); // Watch model for changes scope.$watch(attr.ngModel, function(newValue, oldValue) { diff --git a/src/select/test/select.spec.js b/src/select/test/select.spec.js index 633a16595..bce048e43 100644 --- a/src/select/test/select.spec.js +++ b/src/select/test/select.spec.js @@ -233,6 +233,15 @@ describe('select', function () { expect(sandboxEl.find('.dropdown-menu li').length).toBe(scope.icons.length); expect(sandboxEl.find('.dropdown-menu li:eq(0)').text().trim()).toBe(scope.icons[0].label); }); + + it('should correctly watch for changes for elements in arrays', function() { + var elm = compileDirective('default'); + scope.icons[0].label = scope.icons[0].label + "s" + scope.$digest(); + angular.element(elm[0]).triggerHandler('focus'); + expect(sandboxEl.find('.dropdown-menu li').length).toBe(scope.icons.length); + expect(sandboxEl.find('.dropdown-menu li:eq(0)').text().trim()).toBe(scope.icons[0].label); + }); it('should support bsOptions with filters', function() { var elm = compileDirective('markup-bsOptions-filtered'); From 83e6f91ff97b02f56fc78bb9cfe3fd3ae9558ef9 Mon Sep 17 00:00:00 2001 From: Olivier Louvignes Date: Sat, 31 Oct 2015 15:45:05 +0100 Subject: [PATCH 004/141] chore(npm): update devDeps --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 312318d7d..8d1e2f3bd 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "karma-jasmine": "^0.3.6", "karma-phantomjs-launcher": "^0.2.1", "karma-sauce-launcher": "^0.3.0", - "ng-factory": "^1.0", + "ng-factory": "^1.1.0", "phantomjs": "^1.9.18", "through2": "^2.0.0", "undertaker-lib-tasks": "^0.5.1" From fac071ef4ea5f4b06b2e2014143971ae84ecd6b8 Mon Sep 17 00:00:00 2001 From: Eugene Fidelin Date: Mon, 2 Nov 2015 16:27:05 +0100 Subject: [PATCH 005/141] feat(dropdown): add active state to the dropdown items --- src/dropdown/docs/dropdown.demo.js | 2 +- src/dropdown/dropdown.tpl.html | 2 +- src/dropdown/test/dropdown.spec.js | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/dropdown/docs/dropdown.demo.js b/src/dropdown/docs/dropdown.demo.js index beb724db7..dca6f230c 100644 --- a/src/dropdown/docs/dropdown.demo.js +++ b/src/dropdown/docs/dropdown.demo.js @@ -11,7 +11,7 @@ angular.module('mgcrea.ngStrapDocs') .controller('DropdownDemoCtrl', function($scope, $alert) { $scope.dropdown = [ - {text: ' Another action', href: '#anotherAction'}, + {text: ' Another action', href: '#anotherAction', active: true}, {text: ' Display an alert', click: '$alert("Holy guacamole!")'}, {text: ' External link', href: '/auth/facebook', target: '_self'}, {divider: true}, diff --git a/src/dropdown/dropdown.tpl.html b/src/dropdown/dropdown.tpl.html index 2b86daaff..1735dcbe5 100644 --- a/src/dropdown/dropdown.tpl.html +++ b/src/dropdown/dropdown.tpl.html @@ -1,5 +1,5 @@