material_raingular 0.6.1.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 155bb1da6fc4893669b1cf77beb11335a210d334
-  data.tar.gz: 9891f2bb6516cf51b0af570ef13f4e1d2745251f
+  metadata.gz: 048dd75a86b0e3786218da9a1206216838e8b692
+  data.tar.gz: 4efe491a8fdeee8c09c1d6bbd4e8ed7ad8f0d9df
 SHA512:
-  metadata.gz: 02d485368f2175c6058da01633deb5ec20f2837cb6f7dddbacc8d354e5c4a5b9a24778bee3680c74a2f0c8de55b4075f5ede1bb4a715cd46ccf088d6a9f80efb
-  data.tar.gz: e8a5966065a4d8114006ea795cd355654191804566fbe71ccb27664053abf5a1415e2357f35ba6b24b2e0e762a8f41f9aac6cef1ac509255b007dc51abe1d909
+  metadata.gz: 6a5a3a333fc5f092cb7d518acb617513216d141b906d95c32eab2ce17bba6d549cee69cbc745c164358d2e1fbb5ba433f2ad494f1e1fdd44f7082f4d479940ff
+  data.tar.gz: 5fed44633b7fa405ee270e96b98ee3cb93a29da6073c57ed7ab4e842e7d6d352b80b7c503f5f579a0b361e2b6a8d345aca66ae95b27c83c811cce1ab192dccdf

data/lib/assets/javascripts/material_raingular/directives/drop_file/linkmodel.coffee

@@ -1,9 +1,10 @@
 # //= require material_raingular/directives/drop_file/drop_events
 class DirectiveModels.MrDropFileModel extends AngularLinkModel
+  @inject('$injector')
   initialize: ->
     [@ngModelCtrl,@mrCallbackCtrl] = @$controller
     [@model,@key] = Helpers.NgModelParse(@$attrs.ngModel,@$scope)
-    @fileUpload = new Helpers.FileUpload(@$scope,@model,@key,@$element,@callback)
+    @fileUpload = new Helpers.FileUpload(@$scope,@model,@key,@$element,@callback,@$injector)
     new Modules.MrDropFileEvents(@$element,@fileUpload)
 
   callback: (data) =>

data/lib/assets/javascripts/material_raingular/directives/upload/linkmodel.coffee

@@ -2,23 +2,21 @@
 # //= require material_raingular/directives/upload/events
 class DirectiveModels.MrUploadModel extends AngularLinkModel
   @inject(
-    '$timeout'
-    'RailsUpdater'
+    '$injector'
   )
   initialize: ->
     [@ngModelCtrl,@mrCallbackCtrl] = @$controller
     [@model,@key] = Helpers.NgModelParse(@$attrs.ngModel,@$scope)
-    @fileUpload = new Helpers.FileUpload(@$scope,@model,@key,@$element,@callback)
+    @fileUpload = new Helpers.FileUpload(@$scope,@model,@key,@$element,@callback.bind(@),@$injector)
     @options = @$scope.$eval(@$attrs.mrUploadOptions)
     new Modules.MrUploadEvents(@$element,@fileUpload,@disabled)
-  callback: (data) =>
-    @$scope.$apply =>
-      @$scope[@model][@key] = data[@key]
-      @$scope[@model].thumb = data.thumb
-      @$scope[@model].id    = data.id unless @$scope[@model].id
-      @$scope.progress = 100
-      @$element.removeClass('covered')
-      @mrCallbackCtrl?.evaluate(data)
+  callback: (data) ->
+    @$scope[@model][@key] = data[@key]
+    @$scope[@model].thumb = data.thumb
+    @$scope[@model].id    = data.id unless @$scope[@model].id
+    @$scope.progress = 100
+    @$element.removeClass('covered')
+    @mrCallbackCtrl?.evaluate(data)
 
   fileData: ->
     data = {}

data/lib/assets/javascripts/material_raingular/helpers/file_upload.coffee

@@ -1,10 +1,14 @@
 @Helpers ?= {}
 class Helpers.FileUpload
-  constructor: (@scope,@modelName,@key,@element,@callback)->
+  constructor: (@scope,@modelName,@key,@element,@callback,@$injector)->
+    @$timeout = @$injector.get '$timeout'
+    @$q       = @$injector.get '$q'
+    @model = @scope.$eval(@modelName)
+    ActiveRecord.$Resource._resourcify(@model,@modelName.classify())
   uploadFile: (file)->
     @scope.progress = 0
     @element.addClass('covered')
-    if id = @scope.$eval(@modelName).id
+    if id = @model.id
       route = Routes[@modelName + '_path'](id: id) + '.json'
       method = 'PUT'
     else
@@ -15,28 +19,31 @@ class Helpers.FileUpload
     formData.append @modelName + '[' + @key + ']', file
     xhr = new XMLHttpRequest()
     xhr.upload.addEventListener "progress", (event) =>
-      if event.lengthComputable
-        @scope.$apply =>
-          @scope.progress = Math.round(event.loaded * 100 / event.total)
+      return unless event.lengthComputable
+      @scope.$apply =>
+        @scope.progress = Math.round(event.loaded * 100 / event.total)
     , true
-    xhr.addEventListener "readystatechange", (event) =>
-      if event.target.readyState == 4 && !(event.target.status > 399)
-        data = JSON.parse(event.target.response)
-        @callback(data)
-      else if event.target.readyState == 4 && event.target.status > 399
-        @failed()
-    , false
-    xhr.addEventListener "error", @failed, false
+    xhr.addEventListener "error", @failed.bind(@), false
     xhr.open(method, route)
     csrf = null
     for tag in document.getElementsByTagName('meta')
       csrf = tag.content if tag.name == 'csrf-token'
     xhr.setRequestHeader('X-CSRF-Token', csrf)
-    xhr.send(formData)
-  @failed: (event)=>
+    promise = ->
+      @$q (resolve,reject) ->
+        xhr.onreadystatechange = ->
+          return unless xhr.readyState == 4
+          if xhr.status == 200
+            resolve(JSON.parse xhr.responseText)
+          else
+            reject(JSON.parse xhr.responseText)
+        xhr.send(formData)
+    @model.$promise = @model.$promise.then(promise.bind(@)).then(@success.bind(@),@failed.bind(@))
+    @model.$promise.then(@model.$save.bind(@model))
+  success: (data) -> @callback(data)
+  failed: (data) ->
     @element.addClass('failed')
-
-    timeout ->
+    @$timeout =>
       @element.removeClass('failed')
       @element.removeClass('covered')
     , 2000

data/lib/material_raingular/version.rb

@@ -1,3 +1,3 @@
 module MaterialRaingular
-  VERSION = "0.6.1.1"
+  VERSION = "0.6.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: material_raingular
 version: !ruby/object:Gem::Version
-  version: 0.6.1.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler