material_raingular 0.1.5.1 → 0.1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a728062d5cbdaabed7c7a371c5b10b3ba3e0e14
-  data.tar.gz: 7b9f0c149ae770fe180b02c481965e6c49ec26d9
+  metadata.gz: 3e503ebc7a84e7290dacfbc21e5311d9c4802197
+  data.tar.gz: fe96e83f7d1904f4bd8a83ad7073de629bc4b906
 SHA512:
-  metadata.gz: 72bbe4064ef979057e9b7023b41ea98ded6445a7c8c6f4eff2e3e489e5366f81fa62d1b720f5f21fc526a32efc4b629f432ea0ee45a759495c647235b2a22191
-  data.tar.gz: fc1aaafe38c72cc237d19b89cd53e8caef8741d98da5d8f91608a38a8d84e3a8fabd3dd54ecb86021d44127d4f4ab0ce19630ae3af64d42759c56f88344bf46c
+  metadata.gz: 3118079108faa8513fb88cdd5d1a67e9af2a7f494d11db788c9f175c6bf103251a7094064b0a42fd1f2886e21642ddb3c1bd9fb5648312a3a46350a1bb988e49
+  data.tar.gz: 9dc2e8bcc682d4528b7ef4411e9a72d94534504adf4d7497dc2e5b46003239547890f8cf44348002630df661d4dfcefae0d0bd38ff0773cd9867cbb59f58b669

data/lib/assets/javascripts/directives/ngupload.js.coffee

@@ -62,20 +62,15 @@ class FileUpload
     return data
 
 class NgUploadEvents
-  constructor: (@element,@file_upload) ->
-    clicked = false
-    @element.children('img').bind 'click', (event) =>
-      return if clicked
-      event.target.parentElement.getElementsByTagName('input')[0].click()
-    @element.children('.button').bind 'click', (event) =>
-      return if clicked
+  constructor: (@element,@file_upload,@disabled) ->
+    @element.children().bind 'click', (event) =>
+      return if @disabled()
+      return if event.target.tagName == 'A'
       event.target.parentElement.getElementsByTagName('input')[0].click()
-    @element.children('input').bind 'click', (event) =>
-      clicked = true
     @element.children('input').bind 'change', (event) =>
+      return if @disabled()
       file   = event.target.files[0]
       @file_upload.uploadFile(file)
-      clicked = false
 
 class NgDropFileEvents
   constructor: (@element,@file_upload) ->
@@ -119,12 +114,13 @@ angular.module('NgUpload', [])
     restrict: 'E'
     replace: true,
     require: ['ngModel','?ngCallback'],
-    template:
+    template: (element,attributes) ->
+      disabled = typeof(attributes.disabled) != 'undefined'
       '<span class="ng-upload" style="outline: none">
         <div class="ng-progress-bar">
           <span class="bar" style="width: {{progress || 0}}%;"></span><span class="text" style="margin-left: -{{uploadProgress() || 0}}%;">{{uploadProgress()}}%</span>
         </div>
-        <input accept="{{accept()}}" ng-model="ngModel" type="file" ng-class="{image: file_upload_show(&#39;image&#39;)}" /><img ng-show="file_upload_show(&#39;image&#39;)" ng-src="{{file_upload_data().thumb}}" />
+        <input accept="{{accept()}}" ng-model="ngModel" type="file" ng-class="{image: file_upload_show(&#39;image&#39;)}" ' + (if disabled then 'disabled ') + '/><img ng-show="file_upload_show(&#39;image&#39;)" ng-src="{{file_upload_data().thumb}}" />
         <div class="button" ng-show="file_upload_show(&#39;button&#39;)">
           Select File
         </div>
@@ -132,8 +128,13 @@ angular.module('NgUpload', [])
 
     link: (scope, element, attributes,controllers) ->
       file_upload = new FileUpload($parse,scope,controllers,attributes.ngModel,attributes.ngOverride,element)
-      new NgUploadEvents(element,file_upload)
       options = $parse(attributes.ngUploadOptions)()
       scope.file_upload_show = (type) -> options[type]
       scope.file_upload_data =        -> file_upload.fileData()
       scope.accept           =        -> attributes.accept || '*'
+      disabled = ->
+        el = element[0]
+        until !el.parentElement
+          return true if el.getAttribute('disabled')
+          el = el.parentElement
+      new NgUploadEvents(element,file_upload,disabled)

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.1.5.1"
+  VERSION = "0.1.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.1.5.1
+  version: 0.1.5.2
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Angular v1.4 for rails. Angular Material v0.9.8.