3.1.3-requirejs-problems

brewster1134 · Nov 17, 2015 · 7902e85 · 7902e85
1 parent 78ec223
commit 7902e85
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 82 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,7 @@
 #### CHANGE LOG
+###### 3.1.3
+* fixed issues with requirejs headers
+
 ###### 3.1.2
 * Resonsive Image
   * sets height & width of background image elements

diff --git a/Gemfile b/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'sass', '~> 3.4'
+gem 'sass', '~> 3'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    sass (3.4.13)
+    sass (3.4.19)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  sass (~> 3.4)
+  sass (~> 3)
+
+BUNDLED WITH
+   1.10.6
diff --git a/demo/bumper_demo.js b/demo/bumper_demo.js
diff --git a/lib/bumper-core.js b/lib/bumper-core.js
diff --git a/lib/bumper-dom-jquery.js b/lib/bumper-dom-jquery.js
diff --git a/lib/bumper-responsive-breakpoint.js b/lib/bumper-responsive-breakpoint.js
diff --git a/lib/bumper-responsive-image.js b/lib/bumper-responsive-image.js
diff --git a/src/bumper-core.coffee b/src/bumper-core.coffee
@@ -7,13 +7,13 @@
 # * Licensed under the MIT license.
 ###
 
-((root, factory) ->
-  if typeof define == 'function' && define.amd
+((factory) ->
+  if define.amd
     define [], ->
       factory()
   else
     factory()
-) @, ->
+) ->
 
   class BumperCore
     # Maintain bumper version here...

diff --git a/src/bumper-dom-jquery.coffee b/src/bumper-dom-jquery.coffee
@@ -7,19 +7,18 @@
 # * Licensed under the MIT license.
 ###
 
-((root, factory) ->
-  if typeof define == 'function' && define.amd
+((factory) ->
+  if define.amd
     define [
       'jquery'
-    ], ($) ->
-      factory $
-  else if typeof exports != 'undefined'
-    module.exports = factory jQuery
+      'bumper-core'
+    ], ($, Core) ->
+      factory $, Core
   else
-    factory jQuery
-) @, ($) ->
+    factory window.jQuery, window.Bumper.Core
+) ($, Core) ->
 
-  class BumperDom extends window.Bumper.Core.Module
+  class BumperDom extends Core.Module
     # default options
     options:
       parents: false  # when set to true, searching for elements will be restricted to the parent chain of a root element

diff --git a/src/bumper-responsive-breakpoint.coffee b/src/bumper-responsive-breakpoint.coffee
@@ -7,19 +7,17 @@
 # * Licensed under the MIT license.
 ###
 
-((root, factory) ->
+((factory) ->
   if typeof define == 'function' && define.amd
     define [
       'bumper-core'
-    ], ->
-      factory()
-  else if typeof exports != 'undefined'
-    module.exports = factory()
+    ], (Core) ->
+      factory Core
   else
-    factory()
-) @, ->
+    factory window.Bumper.Core
+) (Core) ->
 
-  class BumperResponsiveBreakpoint extends window.Bumper.Core.Module
+  class BumperResponsiveBreakpoint extends Core.Module
     events: ->
       # check for breakpoint changes on window resize
       window.addEventListener 'resize', => @checkBreakpointChange()