oxymoron 1.1.9 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/oxymoron/directives/fileupload.js +2 -2
  3. data/lib/oxymoron/concern.rb +1 -1
  4. data/lib/oxymoron/engine.rb +1 -1
  5. data/lib/oxymoron/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 122c26bc44169d39d13fc2f0cf1e647d9d15c2c7
4
- data.tar.gz: cf7eb7e94d749c4471a984487aa593951332d13c
3
+ metadata.gz: a35b2786207f83fe2b0c767c62efd9c73748fd95
4
+ data.tar.gz: e1222dce5fac9e3e5ef4cf92af80648751635453
5
5
  SHA512:
6
- metadata.gz: ea8f73787b8cf13d5600c47a98f58ac8c0e8ac84cebf66e3e65c980b531702c0972e2f561df3c14a7e021e0780a8c3f47a188603b525ab7803414aefd97e25f5
7
- data.tar.gz: 085d4f2204b4ffd44b4b88282f0bde7dc1e900668b9e54db948397ae5c57863fcf3ede45f35c16aff6aaa7fd11de23339c4c62627b4995be87387c7ebcc95197
6
+ metadata.gz: 8f7afcc236044af632721609ae1e2847dd0c0aa4f255249383ce5d7d73387a2153115d7d3a2562db2f8cb8f1c45116ad759cf5e8d74e7842f3a05bac8218e875
7
+ data.tar.gz: f859edd479c6462fcfb44324a6367edf2bfe63ee86afa6bed73342df5ecdaea089fbe826d7104eb8f5f9feae1f8db37581158690a1adafe8163f513ffddf610d
data/app/assets/javascripts/oxymoron/directives/fileupload.js CHANGED
@@ -22,10 +22,10 @@ angular.module("oxymoron.directives.fileupload", [])
22
22
 
23
23
  $scope.xhr = new XMLHttpRequest;
24
24
 
25
+ $scope.percentCompleted = 0;
26
+
25
27
  $scope.xhr.upload.onprogress = function(e) {
26
- // Event listener for when the file is uploading
27
28
  $scope.$apply(function() {
28
- var percentCompleted;
29
29
  if (e.lengthComputable) {
30
30
  $scope.percentCompleted = Math.round(e.loaded / e.total * 100);
31
31
  }
data/lib/oxymoron/concern.rb CHANGED
@@ -3,7 +3,7 @@ module Oxymoron
3
3
  extend ActiveSupport::Concern
4
4
 
5
5
  included do
6
- after_filter :set_xsrf_token_cookie
6
+ after_action :set_xsrf_token_cookie
7
7
  end
8
8
 
9
9
  def set_xsrf_token_cookie
data/lib/oxymoron/engine.rb CHANGED
@@ -35,7 +35,7 @@ module Oxymoron
35
35
  write_assets
36
36
  end
37
37
 
38
- ActionDispatch::Reloader.to_prepare do
38
+ ActiveSupport::Reloader.to_prepare do
39
39
  oxymoron_reloader.execute_if_updated
40
40
  end
41
41
  end
data/lib/oxymoron/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oxymoron
2
- VERSION = "1.1.9"
2
+ VERSION = "1.2.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oxymoron
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.9
4
+ version: 1.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kononenko Paul
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-17 00:00:00.000000000 Z
11
+ date: 2017-04-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: awesome_print