Skip to content

Commit 94d067d

Browse files
committed
Merge pull request #1 from JohnnyTheTank/reorderElements
improved api for reorder elements
2 parents 8c6dd3d + b7d7c00 commit 94d067d

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

demo/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
angular.module('app', ['jtt_bricklayer']);
22

33
angular.module('app')
4-
.controller("appController", function ($scope, $timeout) {
5-
$scope.createElement = function (position) {
4+
.controller("appController", function ($scope) {
5+
$scope.createElement = function () {
66
return {
77
color: '#' + Math.random().toString(16).substr(-6),
88
height: sizes[Math.floor(Math.random() * sizes.length)],

dist/angular-bricklayer.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
@name: angular-bricklayer
3-
@version: 1.0.1 (23-04-2016)
3+
@version: 1.0.1 (24-04-2016)
44
@author:
55
@url: https://github.com/JohnnyTheTank/angular-bricklayer
66
@license: MIT
@@ -9,28 +9,34 @@ angular.module('jtt_bricklayer', [])
99
.directive('bricklayer', ['$timeout', function ($timeout) {
1010
return {
1111
restrict: 'C',
12-
replace: 'false',
1312
link: function (scope, element, attrs) {
1413
var bricklayer = new Bricklayer(element[0]);
1514

1615
$timeout(function () {
1716
bricklayer.reorderElements(bricklayer.columnCount);
18-
}, 0);
17+
});
1918

2019
scope.$on('bricklayer.append', function (event, element) {
2120
bricklayer.append(element);
2221
bricklayer.reorderElements(bricklayer.columnCount);
2322
$timeout(function () {
2423
bricklayer.reorderElements(bricklayer.columnCount);
25-
}, 0);
24+
});
2625
});
2726

2827
scope.$on('bricklayer.prepend', function (event, element) {
2928
bricklayer.prepend(element);
3029
bricklayer.reorderElements(bricklayer.columnCount);
3130
$timeout(function () {
3231
bricklayer.reorderElements(bricklayer.columnCount);
33-
}, 0);
32+
});
33+
});
34+
35+
scope.$on('bricklayer.reorderElements', function () {
36+
bricklayer.reorderElements(bricklayer.columnCount);
37+
$timeout(function () {
38+
bricklayer.reorderElements(bricklayer.columnCount);
39+
});
3440
});
3541
}
3642
}
@@ -39,7 +45,6 @@ angular.module('jtt_bricklayer', [])
3945
return {
4046
require: '?bricklayer',
4147
restrict: 'ACE',
42-
replace: 'false',
4348
link: function (scope, element, attrs) {
4449
scope.$emit('bricklayer.append', element[0]);
4550
}
@@ -49,7 +54,6 @@ angular.module('jtt_bricklayer', [])
4954
return {
5055
require: '?bricklayer',
5156
restrict: 'ACE',
52-
replace: 'false',
5357
link: function (scope, element, attrs) {
5458
scope.$emit('bricklayer.prepend', element[0]);
5559
}

dist/angular-bricklayer.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/angular-bricklayer.js

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,25 @@ angular.module('jtt_bricklayer', [])
22
.directive('bricklayer', ['$timeout', function ($timeout) {
33
return {
44
restrict: 'C',
5-
replace: 'false',
65
link: function (scope, element, attrs) {
76
var bricklayer = new Bricklayer(element[0]);
87

98
$timeout(function () {
10-
bricklayer.reorderElements(bricklayer.columnCount);
11-
}, 0);
9+
bricklayer.redraw();
10+
});
1211

1312
scope.$on('bricklayer.append', function (event, element) {
1413
bricklayer.append(element);
15-
bricklayer.reorderElements(bricklayer.columnCount);
16-
$timeout(function () {
17-
bricklayer.reorderElements(bricklayer.columnCount);
18-
}, 0);
14+
bricklayer.redraw();
1915
});
2016

2117
scope.$on('bricklayer.prepend', function (event, element) {
2218
bricklayer.prepend(element);
23-
bricklayer.reorderElements(bricklayer.columnCount);
24-
$timeout(function () {
25-
bricklayer.reorderElements(bricklayer.columnCount);
26-
}, 0);
19+
bricklayer.redraw();
20+
});
21+
22+
scope.$on('bricklayer.redraw', function () {
23+
bricklayer.redraw();
2724
});
2825
}
2926
}
@@ -32,7 +29,6 @@ angular.module('jtt_bricklayer', [])
3229
return {
3330
require: '?bricklayer',
3431
restrict: 'ACE',
35-
replace: 'false',
3632
link: function (scope, element, attrs) {
3733
scope.$emit('bricklayer.append', element[0]);
3834
}
@@ -42,7 +38,6 @@ angular.module('jtt_bricklayer', [])
4238
return {
4339
require: '?bricklayer',
4440
restrict: 'ACE',
45-
replace: 'false',
4641
link: function (scope, element, attrs) {
4742
scope.$emit('bricklayer.prepend', element[0]);
4843
}

0 commit comments

Comments
 (0)