oxymoron 1.1.9 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 122c26bc44169d39d13fc2f0cf1e647d9d15c2c7
-  data.tar.gz: cf7eb7e94d749c4471a984487aa593951332d13c
+  metadata.gz: a35b2786207f83fe2b0c767c62efd9c73748fd95
+  data.tar.gz: e1222dce5fac9e3e5ef4cf92af80648751635453
 SHA512:
-  metadata.gz: ea8f73787b8cf13d5600c47a98f58ac8c0e8ac84cebf66e3e65c980b531702c0972e2f561df3c14a7e021e0780a8c3f47a188603b525ab7803414aefd97e25f5
-  data.tar.gz: 085d4f2204b4ffd44b4b88282f0bde7dc1e900668b9e54db948397ae5c57863fcf3ede45f35c16aff6aaa7fd11de23339c4c62627b4995be87387c7ebcc95197
+  metadata.gz: 8f7afcc236044af632721609ae1e2847dd0c0aa4f255249383ce5d7d73387a2153115d7d3a2562db2f8cb8f1c45116ad759cf5e8d74e7842f3a05bac8218e875
+  data.tar.gz: f859edd479c6462fcfb44324a6367edf2bfe63ee86afa6bed73342df5ecdaea089fbe826d7104eb8f5f9feae1f8db37581158690a1adafe8163f513ffddf610d

data/app/assets/javascripts/oxymoron/directives/fileupload.js

@@ -22,10 +22,10 @@ angular.module("oxymoron.directives.fileupload", [])
 
           $scope.xhr = new XMLHttpRequest;
 
+          $scope.percentCompleted = 0;
+          
           $scope.xhr.upload.onprogress = function(e) {
-              // Event listener for when the file is uploading
               $scope.$apply(function() {
-                  var percentCompleted;
                   if (e.lengthComputable) {
                       $scope.percentCompleted = Math.round(e.loaded / e.total * 100);
                   }

data/lib/oxymoron/concern.rb

@@ -3,7 +3,7 @@ module Oxymoron
     extend ActiveSupport::Concern
 
     included do
-      after_filter :set_xsrf_token_cookie
+      after_action :set_xsrf_token_cookie
     end
 
     def set_xsrf_token_cookie

data/lib/oxymoron/engine.rb

@@ -35,7 +35,7 @@ module Oxymoron
           write_assets
         end
 
-        ActionDispatch::Reloader.to_prepare do
+        ActiveSupport::Reloader.to_prepare do
           oxymoron_reloader.execute_if_updated
         end
       end

data/lib/oxymoron/version.rb

@@ -1,3 +1,3 @@
 module Oxymoron
-  VERSION = "1.1.9"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxymoron
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors:
 - Kononenko Paul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print