AMD support added to src files. Updated Gruntfile.

firstopinion · 5e9388120b3f1b9e86e1c1bdb0818eb3a05a210a · jaridmargolin committed Nov 13, 2013 · Nov 13, 2013 · 5e93881
1 parent d6d5a10
commit 5e9388120b3f1b9e86e1c1bdb0818eb3a05a210a
Unified Split

Showing with 16 additions and 12 deletions.

+6 −4 Gruntfile.js

+2 −2 lib/formatter.js

+1 −1 lib/formatter.min.js

+5 −4 src/tmpls/intro.js

+2 −1 src/tmpls/outro.js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -34,10 +34,12 @@ module.exports = function(grunt) {
           ' * keycode handling\n' +
           ' */ \n\n',
         process: function(src, filepath) {
-          // Remove contents between Exclude Start and Exclude End
-          src = src.replace( /\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig, '');
-          // Rewrite module.exports to local var
-          src = src.replace(/module.exports\s=/g, 'var');
+          if (!/tmpls\/.*\.js/.test(filepath)) {
+            // Remove contents between Exclude Start and Exclude End
+            src = src.replace( /\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig, '');
+            // Rewrite module.exports to local var
+            src = src.replace(/module.exports\s=/g, 'var');
+          }
           // Return final
           return src;
         },
diff --git a/lib/formatter.js b/lib/formatter.js
@@ -6,6 +6,7 @@
  * thanks to digitalBush/jquery.maskedinput for some of the trickier
  * keycode handling
  */ 
+
 ;(function (name, context, definition) {
   if (typeof module !== 'undefined' && module.exports) { module.exports = definition(); }
   else if (typeof define === 'function' && define.amd) { define(definition); }
@@ -619,7 +620,6 @@ utils.isSpecialKey = function (k) {
 utils.isModifier = function (evt) {
   return evt.ctrlKey || evt.altKey || evt.metaKey;
 };
-
 return Formatter;
 
-});
+});
diff --git a/lib/formatter.min.js b/lib/formatter.min.js
diff --git a/src/tmpls/intro.js b/src/tmpls/intro.js
@@ -1,4 +1,5 @@
-;(function (window, document, undefined) {
-
-// Expose to window
-if (typeof window !== 'undefined') { window.Formatter = Formatter; }
+;(function (name, context, definition) {
+  if (typeof module !== 'undefined' && module.exports) { module.exports = definition(); }
+  else if (typeof define === 'function' && define.amd) { define(definition); }
+  else { context[name] = definition(); }
+})('Formatter', this, function () {
diff --git a/src/tmpls/outro.js b/src/tmpls/outro.js
@@ -1,2 +1,3 @@
+return Formatter;
 
-})(window, document);
+});