-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into openshift2
Conflicts: bin/setup_heroku
- Loading branch information
Showing
113 changed files
with
2,079 additions
and
562 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
|
|
||
| guard 'livereload' do | ||
| watch(%r{app/views/.+\.(erb|haml|slim)$}) | ||
| watch(%r{app/helpers/.+\.rb}) | ||
| watch(%r{public/.+\.(css|js|html)}) | ||
| watch(%r{config/locales/.+\.yml}) | ||
| # Rails Assets Pipeline | ||
| watch(%r{(app|vendor)(/assets/\w+/(.+\.(css|js|html|png|jpg))).*}) { |m| "/assets/#{m[3]}" } | ||
| end | ||
|
|
||
| guard :rspec, cmd: 'bundle exec spring rspec' do | ||
| watch(%r{^spec/.+_spec\.rb$}) | ||
| watch(%r{^lib/(.+)\.rb$}) { |m| "spec/lib/#{m[1]}_spec.rb" } | ||
| watch('spec/spec_helper.rb') { "spec" } | ||
|
|
||
| # Rails example | ||
| watch(%r{^app/(.+)\.rb$}) { |m| "spec/#{m[1]}_spec.rb" } | ||
| watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$}) { |m| "spec/#{m[1]}#{m[2]}_spec.rb" } | ||
| watch(%r{^app/controllers/(.+)_(controller)\.rb$}) { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] } | ||
| watch(%r{^spec/support/(.+)\.rb$}) { "spec" } | ||
| watch('config/routes.rb') { "spec/routing" } | ||
| watch('app/controllers/application_controller.rb') { "spec/controllers" } | ||
| watch('spec/rails_helper.rb') { "spec" } | ||
| end | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
76 changes: 76 additions & 0 deletions
76
app/assets/javascripts/components/form_configurable.js.coffee
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| $ -> | ||
| getFormData = (elem) -> | ||
| form_data = $("#edit_agent, #new_agent").serializeObject() | ||
| attribute = $(elem).data('attribute') | ||
| form_data['attribute'] = attribute | ||
| delete form_data['_method'] | ||
| form_data | ||
|
|
||
| window.initializeFormCompletable = -> | ||
| returnedResults = {} | ||
| completableDefaultOptions = (input) -> | ||
| results: [ | ||
| (returnedResults[$(input).data('attribute')] || {text: 'Options', children: [{id: undefined, text: 'loading ...'}]}), | ||
| { | ||
| text: 'Current', | ||
| children: [id: $(input).val(), text: $(input).val()] | ||
| }, | ||
| { | ||
| text: 'Custom', | ||
| children: [id: 'manualInput', text: 'manual input'] | ||
| }, | ||
| ] | ||
|
|
||
| $("input[role~=validatable], select[role~=validatable]").on 'change', (e) => | ||
| form_data = getFormData(e.currentTarget) | ||
| form_group = $(e.currentTarget).closest('.form-group') | ||
| $.ajax '/agents/validate', | ||
| type: 'POST', | ||
| data: form_data | ||
| success: (data) -> | ||
| form_group.addClass('has-feedback').removeClass('has-error') | ||
| form_group.find('span').addClass('hidden') | ||
| form_group.find('.glyphicon-ok').removeClass('hidden') | ||
| returnedResults = {} | ||
| error: (data) -> | ||
| form_group.addClass('has-feedback').addClass('has-error') | ||
| form_group.find('span').addClass('hidden') | ||
| form_group.find('.glyphicon-remove').removeClass('hidden') | ||
| returnedResults = {} | ||
|
|
||
| $("input[role~=validatable], select[role~=validatable]").trigger('change') | ||
|
|
||
| $.each $("input[role~=completable]"), (i, input) -> | ||
| $(input).select2( | ||
| data: -> | ||
| completableDefaultOptions(input) | ||
| ).on("change", (e) -> | ||
| if e.added && e.added.id == 'manualInput' | ||
| $(e.currentTarget).select2("destroy") | ||
| $(e.currentTarget).val(e.removed.id) | ||
| ) | ||
|
|
||
| updateDropdownData = (form_data, element, data) -> | ||
| returnedResults[form_data.attribute] = {text: 'Options', children: data} | ||
| $(element).trigger('change') | ||
| $(element).select2('open') | ||
|
|
||
| $("input[role~=completable]").on 'select2-open', (e) -> | ||
| form_data = getFormData(e.currentTarget) | ||
| return if returnedResults[form_data.attribute] | ||
|
|
||
| $.ajax '/agents/complete', | ||
| type: 'POST', | ||
| data: form_data | ||
| success: (data) -> | ||
| updateDropdownData(form_data, e.currentTarget, data) | ||
| error: (data) -> | ||
| updateDropdownData(form_data, e.currentTarget, [{id: undefined, text: 'Error loading data.'}]) | ||
|
|
||
| $("input[type=radio][role~=form-configurable]").change (e) -> | ||
| input = $(e.currentTarget).parents().siblings("input[data-attribute=#{$(e.currentTarget).data('attribute')}]") | ||
| if $(e.currentTarget).val() == 'manual' | ||
| input.removeClass('hidden') | ||
| else | ||
| input.val($(e.currentTarget).val()) | ||
| input.addClass('hidden') |
Oops, something went wrong.