diff --git a/admin/Gemfile b/admin/Gemfile index 75632d35c..b7f97c03d 100644 --- a/admin/Gemfile +++ b/admin/Gemfile @@ -14,6 +14,7 @@ else ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true" end +gem 'json', '1.8.6' gem 'rails', '> 4.2' gem 'protected_attributes' gem 'rails-observers' diff --git a/admin/Gemfile.lock b/admin/Gemfile.lock index 5b98372e1..2cac39099 100644 --- a/admin/Gemfile.lock +++ b/admin/Gemfile.lock @@ -342,7 +342,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -631,6 +631,7 @@ DEPENDENCIES jasmine (= 1.3.1) jquery-rails (= 4.1.1) jquery-ui-rails (= 5.0.5) + json (= 1.8.6) kickbox launchy mime-types (= 1.25) diff --git a/web/app/assets/javascripts/react-components/stores/AttachmentStore.js.coffee b/web/app/assets/javascripts/react-components/stores/AttachmentStore.js.coffee index e6d795ab7..86c103c53 100644 --- a/web/app/assets/javascripts/react-components/stores/AttachmentStore.js.coffee +++ b/web/app/assets/javascripts/react-components/stores/AttachmentStore.js.coffee @@ -67,11 +67,13 @@ AttachmentActions = @AttachmentActions triggerNotation: () -> if !@attachNotationBtn? @attachNotationBtn = $('input.attachment-notation').eq(0) + console.log("@attachNotationBtn", @attachNotationBtn) @attachNotationBtn.trigger('click') triggerAudio: () -> if !@attachAudioBtn? @attachAudioBtn = $('input.attachment-audio').eq(0) + console.log("@@attachAudioBtn", @attachAudioBtn) @attachAudioBtn.trigger('click')