Permalink
Browse files

Merge pull request #54 from groupe-sii/master

Fix for correct browserify support
  • Loading branch information...
flosse committed Jun 17, 2015
2 parents 36a2af1 + 85e950c commit dedbb22fff68e7f18337b167b30579ed6d94e42a
Showing with 7 additions and 6 deletions.
  1. +3 −3 dist/scaleApp.js
  2. +4 −3 src/scaleApp.coffee
View
@@ -1,5 +1,5 @@
/*!
-scaleapp - v0.5.0 - 2015-01-06
+scaleapp - v0.5.0 - 2015-06-17
This program is distributed under the terms of the MIT license.
Copyright (c) 2011-2015 Markus Kohlhase <mail@markus-kohlhase.de>
*/
@@ -826,12 +826,12 @@ Copyright (c) 2011-2015 Markus Kohlhase <mail@markus-kohlhase.de>
define(function() {
return api;
});
+ } else if ((typeof module !== "undefined" && module !== null ? module.exports : void 0) != null) {
+ module.exports = api;
} else if (typeof window !== "undefined" && window !== null) {
if (window.scaleApp == null) {
window.scaleApp = api;
}
- } else if ((typeof module !== "undefined" && module !== null ? module.exports : void 0) != null) {
- module.exports = api;
}
}).call(this);
View
@@ -22,10 +22,11 @@ api =
if define?.amd?
define -> api
+# support commonJS
+else if module?.exports?
+ module.exports = api
+
# support the browser
else if window?
window.scaleApp ?= api
-# support commonJS
-else if module?.exports?
- module.exports = api

0 comments on commit dedbb22

Please sign in to comment.