updated the uploader to respect the configuration

xn · Jun 22, 2011 · ce87285 · ce87285
1 parent 19a3802
commit ce87285
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/assets/javascripts/mercury/uploader.js.coffee b/app/assets/javascripts/mercury/uploader.js.coffee
@@ -1,5 +1,5 @@
 @Mercury.uploader = (file, options) ->
-  Mercury.uploader.show(file, options)
+  Mercury.uploader.show(file, options) if Mercury.config.uploading.enabled
   return Mercury.uploader
 
 jQuery.extend Mercury.uploader, {

diff --git a/spec/javascripts/mercury/uploader_spec.js.coffee b/spec/javascripts/mercury/uploader_spec.js.coffee
@@ -1,10 +1,11 @@
-require '/assets/mercury/mercury.js'
+require '/assets/mercury.js'
 
 describe "Mercury.uploader", ->
 
   template 'mercury/uploader.html'
 
   beforeEach ->
+    Mercury.config.uploading.enabled = true
     $.fx.off = true
     @mockFile = {
       size: 1024
@@ -28,6 +29,11 @@ describe "Mercury.uploader", ->
       ret = Mercury.uploader(@mockFile)
       expect(ret).toEqual(Mercury.uploader)
 
+    it "doesn't call show if disabled in configuration", ->
+      Mercury.config.uploading.enabled = false
+      Mercury.uploader(@mockFile)
+      expect(@showSpy.callCount).toEqual(0)
+
 
   describe "#show", ->