Skip to content

Make it possible to disable the module without removing it #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Make it possible to disable the module without removing it #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0effb3
make it possible to disable the module without removing it
nigelsim Jan 17, 2018
1b665c3
fixed up tests
nigelsim Jan 21, 2018
1294c1b
removed test for old behaviour
nigelsim Jan 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions dist/angular-zendesk-widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@

angular.forEach(apiMethods, function(method) {
ZendeskWidgetApi.prototype[method] = function() {
if (!settings.accountUrl) {
return;
}
var closureArgs = arguments;
$window.zE(function() {
$window.zE[method].apply($window.zE, closureArgs);
Expand All @@ -68,10 +71,12 @@
angular.module('zendeskWidget')
.run([
'$window',
'$log',
'zendeskWidgetSettings',
function($window, zendeskWidgetSettings) {
function($window, $log, zendeskWidgetSettings) {
if (!zendeskWidgetSettings.accountUrl) {
throw new Error('Missing accountUrl. Please set in app config via ZendeskWidgetProvider');
$log.warn('Missing accountUrl. Please set in app config via ZendeskWidgetProvider');
return;
}

var window = $window;
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-zendesk-widget.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions src/angular-zendesk-widget/zendeskWidget.run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
angular.module('zendeskWidget')
.run([
'$window',
'$log',
'zendeskWidgetSettings',
function($window, zendeskWidgetSettings) {
function($window, $log, zendeskWidgetSettings) {
if (!zendeskWidgetSettings.accountUrl) {
throw new Error('Missing accountUrl. Please set in app config via ZendeskWidgetProvider');
$log.warn('Missing accountUrl. Please set in app config via ZendeskWidgetProvider');
return;
}

var window = $window;
Expand Down
3 changes: 3 additions & 0 deletions src/angular-zendesk-widget/zendeskWidget.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@

angular.forEach(apiMethods, function(method) {
ZendeskWidgetApi.prototype[method] = function() {
if (!settings.accountUrl) {
return;
}
var closureArgs = arguments;
$window.zE(function() {
$window.zE[method].apply($window.zE, closureArgs);
Expand Down
11 changes: 0 additions & 11 deletions test/integration/zendeskWidgetSpec.js
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions test/unit/services/zendeskWidgetProviderSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ describe('ZendeskWidgetProvider', function() {
}));

describe('a set of API methods', function() {
var originalAccountUrl;

beforeEach(function() {
var apiMethods = ['setLocale', 'identify', 'hide', 'show', 'activate'];
// Stub out $window.zE() wrapper and all apiMethods
Expand All @@ -20,6 +22,14 @@ describe('ZendeskWidgetProvider', function() {
spyOn($window.zE, apiMethod).and.callThrough();
}
});
beforeEach(inject(function(_zendeskWidgetSettings_) {
originalAccountUrl = _zendeskWidgetSettings_.accountUrl;
_zendeskWidgetSettings_.accountUrl = 'test.zendesk.con';
}));
afterEach(inject(function(_zendeskWidgetSettings_) {
_zendeskWidgetSettings_.accountUrl = originalAccountUrl;
}));


it("delegates to Zendesk's Web Widget API", function() {
var anyArgs = ['foo', 'bar', 'baz'];
Expand Down