coalescing_panda 3.1.10 → 3.1.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 76c735e68bb5a079675e3c9ab13f6d8bb53cd1b5
4
- data.tar.gz: a327da898bcc55f5524d9692955d2b50edc9ea30
3
+ metadata.gz: 1adae37a1c10e1bb7ce48e9c7bd185a773c2376c
4
+ data.tar.gz: cf1679a860ee794d6f07a9f7d08ccc3caa900983
5
5
  SHA512:
6
- metadata.gz: 6fb0e44bb23faa8343ee86111e858b51a4c6969a1145846de7d31a290e489d57aa23031e3e88751b9570daeafa0bc85a22e38dacbd0aa858b41e7d1d9a552ae2
7
- data.tar.gz: 2ca754d3a525409562f8ab0a4cebcf756abd93ff578c44e5a4254fdc05d05d94f093d3cb4832d4f3a05fdb1d5ae0ea7523bc93c9125c3b8410a52f8a50218d34
6
+ metadata.gz: 7e8cd371f76459b142c138abfc490b3a8d49a7621c617cafc894fc7ee5afa07e2970fd2fc45dc35d3532ab2baf8f553dcbb9580caba6a45a8ef0d98b873fb416
7
+ data.tar.gz: 0fef896981de968e6c2e4e75578d71482840d8b966083e11e6469c37d86378776bac03f8513b7a209e14a7f0e9a8a63ab4595cf608285f9f6953159792676f1f
@@ -1,7 +1,9 @@
1
1
  window.CoalescingPanda or= {}
2
2
 
3
3
  window.CoalescingPanda.CanvasBatchProgress = class CanvasBatchProgress
4
- constructor: (successCallback, errorCallback) ->
4
+ constructor: (successCallback, errorCallback, messages) ->
5
+ window.messages = messages if messages != undefined
6
+ setFlashMessages()
5
7
  batch = $('#batch-progress').data('batch')
6
8
  url = $('#batch-progress').data('url')
7
9
  window.clearPath = $('#batch-progress').data('clear-path')
@@ -13,6 +15,7 @@ window.CoalescingPanda.CanvasBatchProgress = class CanvasBatchProgress
13
15
  url: url
14
16
  success: (data) ->
15
17
  $('#batch-progress').html(data)
18
+ setFlashMessages()
16
19
  batch = $('#batch-info').data('batch')
17
20
  if batch.status == "Completed"
18
21
  clearIntervalAndBatch(data, batch)
@@ -30,13 +33,19 @@ window.CoalescingPanda.CanvasBatchProgress = class CanvasBatchProgress
30
33
  url: window.clearPath
31
34
  type: 'POST'
32
35
  success: (data) ->
33
- # Don't need to anything
36
+ # Don't need to do anything
34
37
 
35
38
  clearIntervalAndBatch = (data, batch) ->
36
39
  clearInterval(window.batchInterval)
37
40
  $('#batch-progress').html(data)
41
+ setFlashMessages()
38
42
  clearBatchFromSession(batch.id)
39
43
 
44
+ setFlashMessages = ->
45
+ if window.messages != undefined
46
+ for key of window.messages
47
+ $(".batch-message-#{key}").text("#{window.messages[key]}")
48
+
40
49
  $ ->
41
50
  $("#batch-container").unbind().bind "batchStarted", (event, data) ->
42
51
  new CanvasBatchProgress()
@@ -1,18 +1,20 @@
1
1
  #batch-info{data: {batch: @batch.to_json}}
2
2
  -if @batch.status == "Queued"
3
- %h6 Data is queued for download from Canvas.
3
+ %h6.batch-message-queued Data is queued for download from Canvas.
4
+
4
5
  -if @batch.status == "Completed"
5
6
  .alert.alert-success
6
7
  %button.close{"data-dismiss" => "alert", :type => "button"} ×
7
- Data successfully downloaded from Canvas.
8
+ %span.batch-message-completed
9
+ Data successfully downloaded from Canvas.
8
10
 
9
11
  -if @batch.status == "Started"
10
- %h6 Downloading data from Canvas
12
+ %h6.batch-message-started Downloading data from Canvas
11
13
  .progress.progress-striped.active
12
14
  .bar{:style => "width: #{@batch.percent_complete}%;"}
13
15
 
14
16
  -if @batch.status == "Error"
15
17
  .alert.alert-block.alert-error
16
18
  %button.close{"data-dismiss" => "alert", :type => "button"} ×
17
- %h6 Data failed to download from Canvas
19
+ %h6.batch-message-error Data failed to download from Canvas
18
20
  = @batch.message
@@ -1,3 +1,3 @@
1
1
  module CoalescingPanda
2
- VERSION = '3.1.10'
2
+ VERSION = '3.1.11'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: coalescing_panda
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.10
4
+ version: 3.1.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Nathan Mills
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-12-04 00:00:00.000000000 Z
13
+ date: 2014-12-05 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails