Skip to content

Commit 5e8ae49

Browse files
committed
Merge pull request #14 from afilgueira/T13
Fix for #13 - uiZeroclipConfig overrides previous configuration
2 parents 9ed8c3f + 7ee0f88 commit 5e8ae49

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

README.md

+6
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ uiZeroclipConfigProvider.setZcConf({
5656
})
5757
```
5858

59+
If you already have your own configuration and don't want it to be overridden:
60+
61+
```js
62+
uiZeroclipConfigProvider.setOverrideConfig(false);
63+
```
64+
5965
The params is an object. and just same as [ZeroClipboard official config](https://github.com/zeroclipboard/zeroclipboard/blob/master/docs/api/ZeroClipboard.md#configuration-options)
6066

6167
## LICENSE

src/angular-zeroclipboard.js

+11-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,18 @@ angular.module('zeroclipboard', [])
1515
hoverClass: "zeroclipboard-is-hover",
1616
activeClass: "zeroclipboard-is-active"
1717
};
18+
var _overrideConfig = true;
19+
1820
this.setZcConf = function(zcConf) {
1921
angular.extend(_zeroclipConfig, zcConf);
2022
};
23+
this.setOverrideConfig = function(overrideConfig) {
24+
_overrideConfig = overrideConfig;
25+
}
2126
this.$get = function() {
2227
return {
23-
zeroclipConfig: _zeroclipConfig
28+
zeroclipConfig: _zeroclipConfig,
29+
overrideConfig: _overrideConfig
2430
};
2531
};
2632
})
@@ -46,7 +52,9 @@ angular.module('zeroclipboard', [])
4652
var _completeHnd;
4753

4854
// config
49-
ZeroClipboard.config(zeroclipConfig);
55+
if(uiZeroclipConfig.overrideConfig) {
56+
ZeroClipboard.config(zeroclipConfig);
57+
}
5058

5159
if (angular.isFunction(ZeroClipboard)) {
5260
scope.client = new ZeroClipboard(btn);
@@ -77,7 +85,7 @@ angular.module('zeroclipboard', [])
7785
}
7886
ZeroClipboard.destroy();
7987
});
80-
88+
8189
scope.client.on('beforecopy', function (e) {
8290
if (scope.onBeforeCopy) {
8391
scope.$apply(function () {

0 commit comments

Comments
 (0)