material_raingular 0.0.2.alpha → 0.0.2.1.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6b89dcb5aaed8e1ccb5bc7b31f826165201b73f
-  data.tar.gz: fc3af078ed0d7119fac7523948286765c587dd51
+  metadata.gz: 08cc207d34aa842e056bc182d7e2b10bd9a7e9ca
+  data.tar.gz: 58d6d0f4258975cfa5ccba21c9ee2676f7260bcc
 SHA512:
-  metadata.gz: 73e7a544ba217cf5b909897ffd4efc2a6d9b7c1710c444f85c596cc21da791a631e6ba68306a4592de9b6cc755e6eb4d03987c7cf8c492f51ae8c7794e01d85d
-  data.tar.gz: f7c1e8316babc822e13807960c4b96a93779959aa51bb6516bbd833bcca463024a7082944aa83262abfa2dfbd027d9d0d794c28caf4adacddfe271d7e98ee00d
+  metadata.gz: 5a8a69ce3377ae510b42767feeed4818ef4c018efe1e84ce34b06604df0d650a843b42b38302caaaf8a26177207f7e13bb9e49477b5dc7bb79b0dff6d1a47597
+  data.tar.gz: f6899269b8c25406a2467c26ff3a97e5f37824753049051c46a35c9d2eda19703a594e50f72f3b87d06da01ae031503c783fd756da9eda2096774bc550478ad9

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

@@ -22,7 +22,7 @@ fileData = (scope,attributes) ->
       data.thumb = scope[unparsedModel[0]].thumb.url if scope[unparsedModel[0]].thumb
   return data
 
-uploadFiles = (scope,element,model,id,file,parent,timeout) ->
+uploadFiles = (scope,element,model,id,file,parent,timeout,callback) ->
   scope.progress = 0
   element.addClass('covered')
   route = Routes[element[0].attributes['ng-model'].value.split('.')[0] + '_path'](id: id) + '.json'
@@ -44,7 +44,7 @@ uploadFiles = (scope,element,model,id,file,parent,timeout) ->
         scope[model[0]].thumb = data.thumb
         scope.progress = 100
         element.removeClass('covered')
-
+        scope.$eval(callback) if callback
     else if this.readyState == 4 && this.status > 399
       failed()
   , false
@@ -81,8 +81,10 @@ angular.module('NgUpload', [])
         fileData(scope,attributes)
 
     controller: ($scope, $element, $http, $timeout) ->
+      callback = ->
+        $element[0].attributes['ng-callback'].value if $element[0].attributes['ng-callback']
       $scope.uploadFiles = (model,id,file,parent) ->
-        uploadFiles($scope,$element,model,id,file,parent,$timeout)
+        uploadFiles($scope,$element,model,id,file,parent,$timeout,callback())
       $scope.progress = 0
       $scope.uploadProgress = ->
         return $scope.progress
@@ -117,6 +119,8 @@ angular.module('NgUpload', [])
         return attributes.accept if attributes.accept
         return '*'
     controller: ($scope, $element, $http, $timeout) ->
+      callback = ->
+        $element[0].attributes['ng-callback'].value if $element[0].attributes['ng-callback']
       $scope.show = (type) ->
         options = $element[0].attributes['ng-upload-options'].value.replace('{','').replace('}','').split(',')
         for option in options
@@ -124,4 +128,4 @@ angular.module('NgUpload', [])
             return true if option.indexOf('true') > -1
         return false
       $scope.uploadFiles = (model,id,file,parent) ->
-        uploadFiles($scope,$element,model,id,file,parent,$timeout)
+        uploadFiles($scope,$element,model,id,file,parent,$timeout,callback())

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.0.2.alpha"
+  VERSION = "0.0.2.1.alpha"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.2.1.alpha
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler