Skip to content

Commit 3117db9

Browse files
committed
v1.1.0
1 parent 6a0618d commit 3117db9

File tree

7 files changed

+28
-21
lines changed

7 files changed

+28
-21
lines changed

dist/v-button.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* vButton - AngularJS pressable button with a busy indicator
3-
* @version v1.0.0
3+
* @version v1.1.0
44
* @link http://lukaszwatroba.github.io/v-button
55
* @author Łukasz Wątroba <l@lukaszwatroba.com>
66
* @license MIT License, http://www.opensource.org/licenses/MIT
@@ -58,7 +58,8 @@
5858
[v-pressable] {
5959
overflow: hidden;
6060
position: relative;
61-
transition: all 0.25s; }
61+
-webkit-transition: all 0.25s;
62+
transition: all 0.25s; }
6263
[v-pressable].is-pressed {
6364
-webkit-transform: scale(0.95);
6465
-ms-transform: scale(0.95);

dist/v-button.js

100755100644
Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* vButton - AngularJS pressable button with a busy indicator
3-
* @version v1.0.0
3+
* @version v1.1.0
44
* @link http://lukaszwatroba.github.io/v-button
55
* @author Łukasz Wątroba <l@lukaszwatroba.com>
66
* @license MIT License, http://www.opensource.org/licenses/MIT
@@ -44,9 +44,10 @@ function vBusyDirective ($document, buttonConfig) {
4444
restrict: 'A',
4545
scope: {
4646
isBusy: '=vBusy',
47-
busyLabel: '@vBusyLabel'
47+
busyLabel: '@vBusyLabel',
48+
busyText: '@vBusyText'
4849
},
49-
compile: function (tElement) {
50+
compile: function (tElement, tAttrs) {
5051
var labelElement = angular.element(tElement.find('span'));
5152

5253
if (!labelElement[0]) {
@@ -56,17 +57,26 @@ function vBusyDirective ($document, buttonConfig) {
5657

5758
return function postLink (scope, iElement) {
5859
var idleLabelHtml = labelElement.html(),
59-
busyLabelHtml = scope.busyLabel || buttonConfig.busyLabel;
60+
busyLabelHtml = scope.busyLabel || buttonConfig.busyLabel,
61+
busyTextHtml = scope.busyText;
6062

6163
scope.$watch('isBusy', function (value) {
6264
if (value) {
6365
iElement.addClass(buttonConfig.states.busy);
6466
labelElement.html(busyLabelHtml);
6567
} else {
6668
iElement.removeClass(buttonConfig.states.busy);
67-
labelElement.html(idleLabelHtml);
69+
labelElement.html(busyTextHtml || idleLabelHtml);
6870
}
6971
});
72+
73+
tAttrs.$observe('vBusyLabel', function(value) {
74+
busyLabelHtml = value;
75+
});
76+
77+
tAttrs.$observe('vBusyText', function(value) {
78+
busyTextHtml = value;
79+
});
7080
};
7181
}
7282
};
@@ -75,7 +85,6 @@ vBusyDirective.$inject = ['$document', 'buttonConfig'];
7585

7686

7787

78-
7988
// vPressable directive
8089
angular.module('vButton.directives')
8190
.directive('vPressable', vPressableDirective);

dist/v-button.min.css

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

dist/v-button.min.js

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

index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h5 class="u-marginBl">AngularJS pressable button with a busy indicator.</h5>
5757
<button class="Button Button--default" v-pressable>Pressable Button</button>
5858
</li>
5959
<li class="ButtonGroup-item u-marginAs">
60-
<button class="Button Button--default" ng-click="isLoading = !isLoading" v-busy="isLoading" v-busy-label="Please wait" v-pressable>Busy Button</button>
60+
<button class="Button Button--default" ng-click="isLoading = !isLoading" v-busy="isLoading" v-busy-text="" v-busy-label="Please wait" v-pressable>Busy Button</button>
6161
</li>
6262
</ul>
6363
</div>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "v-button",
33
"description": "vButton - AngularJS pressable button with a busy indicator",
4-
"version": "1.0.0",
4+
"version": "1.1.0",
55
"author": "Łukasz Wątroba <l@lukaszwatroba.com>",
66
"license": "MIT",
77
"keywords": [

src/vButton/directives/v-busy.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,15 @@ function vBusyDirective ($document, buttonConfig) {
3636
}
3737
});
3838

39-
tAttrs.$observe('vBusyLabel', function(value)
40-
{
41-
busyLabelHtml = value;
39+
tAttrs.$observe('vBusyLabel', function(value) {
40+
busyLabelHtml = value;
4241
});
4342

44-
tAttrs.$observe('vBusyText', function(value)
45-
{
46-
busyTextHtml = value;
43+
tAttrs.$observe('vBusyText', function(value) {
44+
busyTextHtml = value;
4745
});
4846
};
4947
}
5048
};
5149
}
5250
vBusyDirective.$inject = ['$document', 'buttonConfig'];
53-

0 commit comments

Comments
 (0)