Skip to content

Commit

Permalink
Remove cruft left over from the extraction of
Browse files Browse the repository at this point in the history
the gem from original application: CSS, JavaScript.

References #39
  • Loading branch information
mgurley committed Sep 6, 2014
1 parent 3888836 commit ef53924
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 12 deletions.
4 changes: 0 additions & 4 deletions app/assets/javascripts/abstractor/abstractor.js.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Abstractor.AbstractionUI = ->
parent_div = $(this).closest(".abstractor_abstraction")
parent_div.load $(this).attr("href"), ->
parent_div.find(".combobox").combobox watermark: "a value"
parent_div.find("input[type=\"submit\"], button, a.button").button()
$(".abstractor_datepicker").datepicker
altFormat: "yy-mm-dd"
dateFormat: "yy-mm-dd"
Expand All @@ -17,13 +16,10 @@ Abstractor.AbstractionUI = ->
parent_div.addClass "highlighted"
return


#parent_div.siblings('.abstractor_abstraction').block({ message: null, overlayCSS: { opacity: .2 }});
$(document).on "ajax:success", "form.edit_abstractor_abstraction", (e, data, status, xhr) ->
parent_div = $(this).closest(".abstractor_abstraction")
parent_div.html xhr.responseText

#parent_div.siblings('.abstractor_abstraction').unblock();
parent_div.removeClass "highlighted"
return

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
- source_about = abstractor_suggestion_source.source_type.constantize.find(abstractor_suggestion_source.source_id)
- from_method = abstractor_suggestion_source.source_method
- if from_method && source_about.respond_to?(from_method)
%span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel => "#abstraction_text_#{abstractor_suggestion_source.id}", :title => "#{source_about.class.to_s} #{from_method}"}
%span{ :class => 'abstractor_abstraction_source_tooltip_img', :rel => "#abstraction_text_#{abstractor_suggestion_source.id}", :title => "#{source_about.class.to_s} #{from_method}"}
= image_tag('abstractor/page.png', :id => "abstraction_text_link_#{abstractor_suggestion_source.id}")
%div{ :id => "abstraction_text_#{abstractor_suggestion_source.id}", :class => 'abstractor_abstraction_source_tooltip'}
- abstractable_from_column = source_about.send(from_method)
Expand Down Expand Up @@ -67,7 +67,7 @@
- abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name == 'nlp suggestion' }.each do |abstractor_abstraction_source|
- abstractor_abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
- dom_id = "#{abstractor_abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
%span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel =>"#abstraction_text_#{dom_id}", :title => "#{source[:source_type].to_s} #{source[:source_method]}"}
%span{ :class => 'abstractor_abstraction_source_tooltip_img', :rel =>"#abstraction_text_#{dom_id}", :title => "#{source[:source_type].to_s} #{source[:source_method]}"}
= image_tag('abstractor/page.png', :id => "abstraction_text_link_#{dom_id}")
%br
%div{ :id => "abstraction_text_#{dom_id}", :class => 'tooltip'}
Expand Down
4 changes: 2 additions & 2 deletions app/views/abstractor/abstractor_abstractions/_list.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
- namespace_type ||= @namespace_type
- namespace_id ||= @namespace_id
.abstractor_abstractions
= link_to 'Not applicable all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'not applicable')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link"
= link_to 'Unknown all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'unknown')), :confirm => 'Are you sure?', :method => :put, :class => "icon_link update_link"
= link_to 'Not applicable all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'not applicable')), confirm:'Are you sure?', method: :put, class: 'abstractor_not_applicable_all_link'
= link_to 'Unknown all', Abstractor::UserInterface.abstractor_relative_path(abstractor.update_all_abstractor_abstractions_path(about_type: about.class, about_id: about.id, abstractor_abstraction_value: 'unknown')), confirm: 'Are you sure?', method: :put, class: 'abstractor_unknown_all_link'
- abstractor_subject_groups = about.class.abstractor_subject_groups(namespace_type: namespace_type, namespace_id: namespace_id)
- abstractor_subject_groups.each do |abstractor_subject_group|
.abstractor_subject_groups_container
Expand Down
6 changes: 3 additions & 3 deletions app/views/abstractor/abstractor_abstractions/edit.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
- abstraction_source.normalize_from_method_to_sources(abstractor_abstraction.about).each do |source|
- if source[:source_type] && source[:source_id] && source[:source_method]
- dom_id = "#{abstraction_source.id}_#{source[:source_type]}_#{source[:source_id]}_#{source[:source_method]}"
%span{ :class => 'abstractor_abstraction_source_tooltip_img label', :rel =>"#abstraction_text_#{dom_id}", :title => "#{source[:source_type].to_s} #{source[:source_method]}"}
%span{ :class => 'abstractor_abstraction_source_tooltip_img', :rel =>"#abstraction_text_#{dom_id}", :title => "#{source[:source_type].to_s} #{source[:source_method]}"}
= image_tag('abstractor/page.png', :id => "abstraction_text_link_#{dom_id}")
%br
%div{ :id => "abstraction_text_#{dom_id}", :class => 'tooltip'}
= simple_format(source[:source_type].find(source[:source_id]).send(source[:source_method]))
.column-4
= f.submit 'Save', :class => 'button positive'
= link_to 'Cancel', abstractor_abstraction, :class => 'button negative', :remote => true
= f.submit 'Save'
= link_to 'Cancel', abstractor_abstraction, :remote => true
.clear
.indirect_sources
- abstraction_sources = abstractor_abstraction.abstractor_subject.abstractor_abstraction_sources.select { |s| s.abstractor_abstraction_source_type.name == 'indirect' }
Expand Down
2 changes: 1 addition & 1 deletion features/encounter_notes/edit.feature
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ Feature: Editing encounter note
And "input#abstractor_abstraction_not_applicable" in the first ".abstractor_abstraction" should not be checked
And ".abstractor_abstraction_edit" in the first ".abstractor_abstraction" should contain selector "input#abstractor_abstraction_unknown"
And "input#abstractor_abstraction_unknown" in the first ".abstractor_abstraction" should not be checked
Then ".abstractor_abstraction_edit input.positive" should contain "Save"
Then ".abstractor_abstraction_edit input[type='submit']" should contain "Save"
And I should see "Cancel"
When I check "input#abstractor_abstraction_unknown" within the first ".abstractor_abstraction"
Then "select.combobox" in the first ".abstractor_abstraction" should not contain selector "option[selected='selected']"
Expand Down

0 comments on commit ef53924

Please sign in to comment.