Skip to content

Commit

Permalink
Merge pull request #91 from tontonAurel/update/localforage
Browse files Browse the repository at this point in the history
fix: webpack support
  • Loading branch information
ocombe committed Feb 15, 2016
2 parents 233afbc + 249d2f2 commit fc0f847
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions dist/angular-localForage.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
*/
(function(root, factory) {
'use strict';

var angular = root.angular || (window && window.angular);
if(typeof define === 'function' && define.amd) { // AMD
define(['localforage'], function(localforage) {
factory(root.angular, localforage);
factory(angular, localforage);
});
} else if(typeof exports === 'object' || typeof global === 'object') {
var angular = root.angular || (window && window.angular);
module.exports = factory(angular, require('localforage')); // Node/Browserify
} else {
return factory(root.angular, root.localforage); // Browser
return factory(angular, root.localforage); // Browser
}
})(this, function(angular, localforage, undefined) {
'use strict';
Expand Down Expand Up @@ -485,4 +484,3 @@

return angularLocalForage.name;
});

6 changes: 3 additions & 3 deletions src/angular-localForage.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
(function(root, factory) {
'use strict';

var angular = root.angular || (window && window.angular);
if(typeof define === 'function' && define.amd) { // AMD
define(['localforage'], function(localforage) {
factory(root.angular, localforage);
factory(angular, localforage);
});
} else if(typeof exports === 'object' || typeof global === 'object') {
var angular = root.angular || (window && window.angular);
module.exports = factory(angular, require('localforage')); // Node/Browserify
} else {
return factory(root.angular, root.localforage); // Browser
return factory(angular, root.localforage); // Browser
}
})(this, function(angular, localforage, undefined) {
'use strict';
Expand Down

0 comments on commit fc0f847

Please sign in to comment.