fat_free_crm 0.13.2 → 0.13.3

data/app/views/accounts/destroy.js.haml

@@ -1,6 +1,6 @@
 - entity_name = controller.controller_name.singularize.underscore
 - @entity = instance_variable_get("@#{entity_name}")
 
-jQuery('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
+$('##{dom_id(@entity)}').css('background-color', '#ffe4e1').slideUp(250);
 = refresh_sidebar(:index, :filters)
-jQuery('#paginate').replaceWith('#{ j render(:partial => "shared/paginate_with_per_page") }');
+$('#paginate').replaceWith('#{ j render(:partial => "shared/paginate_with_per_page") }');

data/app/views/accounts/edit.js.haml

@@ -8,14 +8,14 @@
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
   - else                                            # Called from index page...
-    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
 
 - else # <----------------------------------------  Show [Edit] form.
 
   - if params[:cancel].blank?                       # Called from index page...
     - if @previous                                  # Hide open [Edit] form if any.
       - if @previous.is_a?(@entity.class)
-        jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
+        $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @previous ]) }');
       - else
         crm.flick('#{entity_name}_#{@previous}', 'remove');
     -# Disable onMouseOver for the list item.
@@ -23,10 +23,10 @@
     -# Hide [Create] form if any.
     crm.hide_form('create_#{entity_name}');
     -# Show [Edit] form.
-    jQuery('##{id}').html('#{ j render(:partial => "edit") }');
+    $('##{id}').html('#{ j render(:partial => "edit") }');
 
   - elsif params[:cancel].false?                    # Called from title of the landing page...
-    jQuery('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
+    $('#edit_#{entity_name}').html('#{ j render(:partial => "edit") }');
     crm.flip_form('edit_#{entity_name}');
     crm.set_title('edit_#{entity_name}', "#{t :edit} #{h @entity.name}");
-  jQuery('#new_#{entity_name} input[type!=hidden]').first().focus();
+  $('#new_#{entity_name} input[type!=hidden]').first().focus();

data/app/views/accounts/index.js.haml

@@ -2,10 +2,10 @@
 - @entities = instance_variable_get("@#{entities}")
 
 - if @entities.any?
-  jQuery('##{entities}').html('#{ j render(@entities) }');
+  $('##{entities}').html('#{ j render(@entities) }');
 - else
-  jQuery('##{entities}').html('#{ j render(:partial => "shared/empty") }');
+  $('##{entities}').html('#{ j render(:partial => "shared/empty") }');
 
-jQuery('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
-jQuery('#export').html('#{ j render(:partial => "shared/export") }');
-jQuery('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');
+$('#paginate').html('#{ j render(:partial => "shared/paginate_with_per_page") }');
+$('#export').html('#{ j render(:partial => "shared/export") }');
+$('#search_results_count').html('#{ j render(:text => t('search_results_count', :count => @search_results_count)) }');

data/app/views/accounts/new.js.haml

@@ -5,7 +5,7 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{create_id}');
 
 - unless params[:cancel].true?
-  jQuery('##{create_id}').html('#{ j render(:partial => "new") }');
+  $('##{create_id}').html('#{ j render(:partial => "new") }');
   crm.set_title('#{create_id}', '#{ j t(create_id) }');
 - else
   crm.set_title('#{create_id}', '#{ j t(entity_name.pluralize) }');

data/app/views/accounts/show.html.haml

@@ -13,7 +13,7 @@
   = render "comments/new", :commentable => @account
   = render :partial => "shared/timeline", :collection => @timeline
 
-  = hook(:show_account_bottom, self) do
+  = hook(:show_account_bottom, self, {entity: @account}) do
 
     = render :partial => "tasks/tasks", :locals => {:object => @account}
 

data/app/views/accounts/show.js.haml

@@ -1,5 +1,5 @@
 - entity_name = controller.controller_name.singularize.underscore #account
 - @entity = instance_variable_get("@#{entity_name}")
 
-jQuery('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
+$('#main').html('#{ j (render :template => "#{entity_name.pluralize}/show.html", entity_name => @entity) }');
 = raw generate_js_for_popups(@entity, :tasks, :contacts, :opportunities)

data/app/views/accounts/update.js.haml

@@ -8,10 +8,12 @@
     crm.set_title('edit_#{entity_name}', '#{h @entity.name}');
     = refresh_sidebar(:show, :summary)
   - else
-    jQuery('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
-    jQuery('##{id}').effect("highlight", { duration:1500 });
+    $('##{id}').replaceWith('#{ j render(:partial => entity_name, :collection => [ @entity ]) }');
+    $('##{id}').effect("highlight", { duration:1500 });
     = refresh_sidebar(:index, :filters)
 - else
-  jQuery('##{id}').html('#{ j render(:partial => "edit") }');
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
+  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('##{dom_id(@entity, :edit)} input[type!=hidden]').first().focus();
+
+= hook(:entity_update, self, {entity: @entity}) {}

data/app/views/admin/field_groups/_field_group.html.haml

@@ -17,11 +17,10 @@
 
   .remote{ hidden.merge(:id => edit_form_id) }
 
-  .list{ :id => dom_id(field_group, :fields) }
-    - if (fields = field_group.fields.without_pairs).present?
-      = render :partial => "admin/fields/field", :collection => fields
-    - else
-      .empty{:id => "empty_#{asset}_field_group_#{field_group.id}"}
+  .list
+    %ul{ :id => dom_id(field_group, :fields), 'data-sortable' => sort_admin_fields_path(:field_group_id => field_group.id), 'data-sortable-connect-with' => '.fields', 'data-sortable-handle' => '.handle' }
+      = render :partial => "admin/fields/field", :collection => field_group.fields.without_pairs
+      %li.empty
         = t(:field_group_empty)
         = link_to t(:create_field), '#', :class => 'create', 'data-for' => create_form_id
 

data/app/views/admin/field_groups/confirm.js.haml

@@ -1,7 +1,7 @@
 - id = dom_id(@field_group, :confirm)
 
-if (jQuery('##{id}').size() > 0) {
+if ($('##{id}').size() > 0) {
 crm.flick('#{id}', 'remove');
 } else {
-jQuery('##{dom_id(@field_group)}').prepend('#{ j (render :partial => "confirm") }');
+$('##{dom_id(@field_group)}').prepend('#{ j (render :partial => "confirm") }');
 }

data/app/views/admin/field_groups/create.js.haml

@@ -4,17 +4,11 @@
 - container_id = "#{asset}_field_groups"
 
 - if @field_group.valid?
-  jQuery('##{id}_arrow').html(crm.COLLAPSED);
-  jQuery('##{id}').slideUp( { duration:250, complete: function() {jQuery(this).html('')} } );
-  jQuery('##{container_id}').after('#{ j(render :partial => "field_group", :collection => [ @field_group ]) }');
-
-  - group_list_ids = klass.field_groups.map {|field_group| dom_id(field_group, :fields)}
-  - klass.field_groups.each do |field_group|
-    jQuery('##{container_id}').after('#{ j(sortable_element(dom_id(field_group, :fields), :url => sort_admin_fields_path(:field_group_id => field_group.id), :containment => group_list_ids, :dropOnEmpty => true)) }');
-
-  jQuery('##{container_id}').after('#{ j(sortable_element(container_id, :url => sort_admin_field_groups_path(:asset => asset), :tag => :div)) }');
-  jQuery('##{dom_id(@field_group)}').effect('highlight', { duration:1500 });
+  $('##{id}_arrow').html(crm.COLLAPSED);
+  $('##{id}').slideUp( { duration:250, complete: function() {$(this).html('')} } );
+  $('##{container_id}').after('#{ j(render :partial => "field_group", :collection => [ @field_group ]) }');
+  $('##{dom_id(@field_group)}').effect('highlight', { duration:1500 });
 
 - else
-  jQuery('##{id}').html('#{ j render(:partial => "new") }');
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('##{id}').html('#{ j render(:partial => "new") }');
+  $('##{id}').effect("shake", { duration:250, distance: 6 });

data/app/views/admin/field_groups/destroy.js.haml

@@ -1,9 +1,9 @@
 - id = dom_id(@field_group)
 
 - if @field_group.destroyed?
-  jQuery('##{id}').css('background-color', '#ffe4e1').slideUp(250);
+  $('##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
-  jQuery('##{id}').effect("shake", { distance:5 }, 250);
-  jQuery('#flash').html('#{ j t(:msg_cant_delete_field_group) }');
+  $('##{id}').effect("shake", { distance:5 }, 250);
+  $('#flash').html('#{ j t(:msg_cant_delete_field_group) }');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/field_groups/edit.js.haml

@@ -9,4 +9,4 @@
 - else # <----------------------------------------- Show [Edit field_group] form.
 
   crm.show_form('#{form_id}');
-  jQuery('##{form_id}').html('#{ j render(:partial => "edit") }');
+  $('##{form_id}').html('#{ j render(:partial => "edit") }');

data/app/views/admin/field_groups/new.js.haml

@@ -5,4 +5,4 @@ crm.flick('empty', 'toggle');
 crm.flip_form('#{id}');
 
 - if params[:cancel] != "true"
-  jQuery('##{id}').html('#{ j render(:partial => 'new') }');
+  $('##{id}').html('#{ j render(:partial => 'new') }');

data/app/views/admin/field_groups/update.js.haml

@@ -4,5 +4,5 @@
   crm.flip_form('#{id}');
   crm.set_title('#{dom_id(@field_group)}', '#{field_group_subtitle(@field_group)}');
 - else
-  jQuery('##{id}').html('#{ j render(:partial => 'edit') }');
-  jQuery('##{id}').effect('shake', { distance:5 }, 250);
+  $('##{id}').html('#{ j render(:partial => 'edit') }');
+  $('##{id}').effect('shake', { distance:5 }, 250);

data/app/views/admin/fields/_field.html.haml

@@ -12,6 +12,6 @@
     == (#{t("field_types.#{field.as}.title")})
 
     = t(:added_ago, value: timeago(field.created_at)).html_safe
-    = hook(:field_bottom, self, :field => field)
+    = hook(:field_bottom, self, :field => field) {}
 
   .edit_field

data/app/views/admin/fields/_sort_by.html.haml

@@ -3,8 +3,8 @@
 
 :plain
   new crm.Menu({
-    trigger   : "sort_by",
-    fade      : 0.5,
-    appear    : 0.5,
+    trigger   : "#sort_by",
+    fade      : 500,
+    appear    : 500,
     menu_items: [ #{sort_by_menu_items.join(",")} ]
   });

data/app/views/admin/fields/create.js.haml

@@ -5,13 +5,13 @@
 - empty_field_id = "empty_opportunity_field_group_#{@field.field_group_id}"
 
 - if @field.valid?
-  jQuery("##{id}_arrow").html(crm.COLLAPSED)
-  jQuery('##{create_field_id}').before('#{ j (render :partial => "field", :collection => [@field]) }')
-  jQuery('##{create_field_id}').before('#{ j (sortable_element(container_id, :url => sort_admin_fields_path(:field_group_id => @field.field_group_id))) }')
-  jQuery('##{custom_field_id}').effect("highlight", { duration:1500 });
-  jQuery("##{create_field_id}").hide();
-  jQuery("##{empty_field_id}").hide();
+  $("##{id}_arrow").html(crm.COLLAPSED)
+  $('##{container_id}').append('#{ j (render :partial => "field", :collection => [@field]) }')
+  $('##{custom_field_id}').effect("highlight", { duration:1500 });
+  $("##{create_field_id}").hide();
+  $("##{empty_field_id}").hide();
+  $('##{container_id}').sortable('reset');
 - else
-  jQuery('##{id}').html('#{ j render(:partial => "admin/fields/form", :locals => {:field_group_id => @field.field_group_id}) }')
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('##{id}').find('input[type="text"]').first().focus()
+  $('##{id}').html('#{ j render(:partial => "admin/fields/form", :locals => {:field_group_id => @field.field_group_id}) }')
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('##{id}').find('input[type="text"]').first().focus()

data/app/views/admin/fields/destroy.js.haml

@@ -1,8 +1,8 @@
 - id = dom_id(@field)
 - if @field.destroyed?
-  jQuery('li##{id}').css('background-color', '#ffe4e1').slideUp(250);
+  $('li##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
-  jQuery('li##{id}').effect("shake", { duration:250, distance: 6});
-  jQuery('#flash').html('#{ j flash[:warning] }')
-  jQuery(crm.flash('warning'))
+  $('li##{id}').effect("shake", { duration:250, distance: 6});
+  $('#flash').html('#{ j flash[:warning] }')
+  $(crm.flash('warning'))
   - flash[:warning] = nil

data/app/views/admin/fields/edit.js.haml

@@ -1,3 +1,3 @@
 - id = dom_id(@field)
-html = jQuery.parseHTML('#{j render(:partial => "admin/fields/form")}')
-jQuery('##{id}').find('.edit_field').replaceWith( html )
+html = $.parseHTML('#{j render(:partial => "admin/fields/form")}')
+$('##{id}').find('.edit_field').replaceWith( html )

data/app/views/admin/fields/index.html.haml

@@ -28,14 +28,7 @@
     .title
       = t(asset)
 
-    - container_id = "#{asset}_field_groups"
-    .list{ :id => container_id }
+    .list{ :id => "#{asset}_field_groups", 'data-sortable' =>  sort_admin_field_groups_path(:asset => asset) }
       = render :partial => "admin/field_groups/field_group", :collection => klass.field_groups, :locals => {:asset => asset, :klass => klass}
 
-    - group_list_ids = klass.field_groups.map {|field_group| dom_id(field_group, :fields)}
-    - klass.field_groups.each do |field_group|
-      = sortable_element(dom_id(field_group, :fields), :url => sort_admin_fields_path(:field_group_id => field_group.id), :containment => group_list_ids, :dropOnEmpty => true)
-
-    = sortable_element(container_id, :url => sort_admin_field_groups_path(:asset => asset), :tag => :div)
-
     .remote{ hidden.merge(:id => create_form_id) }

data/app/views/admin/fields/show.html.haml

@@ -38,4 +38,4 @@
   %b
     = @field.updated_at.to_s
 
-= hook(:show_field_bottom, self)
+= hook(:show_field_bottom, self) {}

data/app/views/admin/fields/update.js.haml

@@ -2,12 +2,12 @@
 - container_id = "#{@field.klass_name.downcase}_field_groups"
 
 - if @field.errors.empty?
-  html = jQuery.parseHTML('#{ j (render :partial => "field", :collection => [@field]) }');
-  jQuery('##{id}').replaceWith( html);
-  jQuery('##{id}').effect("highlight", { duration:1000 });
-  jQuery('##{container_id}').after('#{ j (sortable_element(container_id, :url => sort_admin_fields_path(:field_group_id => @field.field_group_id))) }');
+  html = $.parseHTML('#{ j (render :partial => "field", :collection => [@field]) }');
+  $('##{id}').replaceWith(html);
+  $('##{id}').effect("highlight", { duration:1000 });
+  $('##{container_id}').sortable('reset');
 - else
-  html = jQuery.parseHTML('#{ j(render :partial => "form") }');
-  jQuery('##{id}').find('.edit_field').replaceWith( html );
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('##{id}').find('input[type="text"]').first().focus();
+  html = $.parseHTML('#{ j(render :partial => "form") }');
+  $('##{id}').find('.edit_field').replaceWith( html );
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('##{id}').find('input[type="text"]').first().focus();

data/app/views/admin/groups/_form.html.haml

@@ -8,6 +8,4 @@
       %td
         .label.top.req #{t :users}:
         %br
-        = f.select :user_ids, User.all.map {|u| [u.full_name, u.id]}, {}, :multiple => true
-        :javascript
-          new Chosen($('group_user_ids'));
+        = f.select :user_ids, User.all.map {|u| [u.full_name, u.id]}, {}, :multiple => true, :class => 'select2'

data/app/views/admin/groups/create.js.haml

@@ -1,10 +1,10 @@
 - if @group.valid?
-  jQuery('#create_group_arrow').html(crm.COLLAPSED);
-  jQuery('#create_group_title').html('#{ j t(:groups) }');
-  jQuery('#create_group').slideUp(250);
-  jQuery('#groups').prepend('#{ j (render :partial => "group", :collection => [ @group ]) }');
-  jQuery('##{dom_id(@group)}').effect("highlight", { duration:1500 });
+  $('#create_group_arrow').html(crm.COLLAPSED);
+  $('#create_group_title').html('#{ j t(:groups) }');
+  $('#create_group').slideUp(250);
+  $('#groups').prepend('#{ j (render :partial => "group", :collection => [ @group ]) }');
+  $('##{dom_id(@group)}').effect("highlight", { duration:1500 });
 - else
-  jQuery('#create_group').html('#{ j render(:partial => "new") }');
-  jQuery('#create_group').effect("shake", { duration:250, distance: 6 });
-  jQuery('#group_name').focus();
+  $('#create_group').html('#{ j render(:partial => "new") }');
+  $('#create_group').effect("shake", { duration:250, distance: 6 });
+  $('#group_name').focus();

data/app/views/admin/groups/destroy.js.haml

@@ -1,9 +1,9 @@
 - id = dom_id(@group)
 - if @group.destroyed?
-  jQuery('##{id}').css('background-color', '#ffe4e1').slideUp(250);
+  $('##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
   crm.flick("#{dom_id(@group, :confirm)}, 'remove')");
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('#flash').html('#{ j flash[:warning] }');
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('#flash').html('#{ j flash[:warning] }');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/groups/edit.js.haml

@@ -1,7 +1,7 @@
 - id = dom_id(@group)
 
 - if params[:cancel].true?     # <----------------- Hide [Edit Group]
-  jQuery('##{id}').replaceWith('#{ j (render(:partial => "group", :collection => [ @group ])) }');
+  $('##{id}').replaceWith('#{ j (render(:partial => "group", :collection => [ @group ])) }');
 
 - else # <----------------------------------------  Show [Edit Group] form.
 
@@ -10,5 +10,5 @@
   -# Hide [Create Group] form if any.
   crm.hide_form('create_group');
   -# Show [Edit Group] form.
-  jQuery('##{id}').html('#{ j render(:partial => "edit") }');
-  jQuery('#group_name').focus();
+  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('#group_name').focus();

data/app/views/admin/groups/index.js.haml

@@ -1,2 +1,2 @@
-jQuery('#groups').html('#{ j render(:partial => "admin/groups/group", :collection => @groups) }');
-jQuery('#paginate').html('#{ j render(:partial => "shared/paginate") }')
+$('#groups').html('#{ j render(:partial => "admin/groups/group", :collection => @groups) }');
+$('#paginate').html('#{ j render(:partial => "shared/paginate") }')

data/app/views/admin/groups/new.js.haml

@@ -1,8 +1,8 @@
 crm.flip_form('create_group');
 
 - unless params[:cancel].true?
-  jQuery('#create_group').html('#{ j render(:partial => "new") }');
-  jQuery('#empty').html('');
+  $('#create_group').html('#{ j render(:partial => "new") }');
+  $('#empty').html('');
   crm.set_title('create_group', '#{t(:create_group)}');
 
 - else

data/app/views/admin/groups/update.js.haml

@@ -1,9 +1,9 @@
 - id = dom_id(@group)
 
 - if @group.errors.empty?
-  jQuery('##{id}').replaceWith('#{ j render(:partial => "group", :collection => [ @group ]) }')
-  jQuery('##{id}').effect("highlight", { duration:1000 });
+  $('##{id}').replaceWith('#{ j render(:partial => "group", :collection => [ @group ]) }')
+  $('##{id}').effect("highlight", { duration:1000 });
 - else
-  jQuery('##{id}').html('#{j render(:partial => "edit") }')
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('#group_name').focus()
+  $('##{id}').html('#{j render(:partial => "edit") }')
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('#group_name').focus()

data/app/views/admin/tags/confirm.js.haml

@@ -1,7 +1,7 @@
 - id = dom_id(@tag, :confirm)
 
-if (jQuery('##{id}').size() > 0) {
+if ($('##{id}').size() > 0) {
 crm.flick('#{id}', 'remove');
 } else {
-jQuery('##{dom_id(@tag)}').prepend('#{ j (render :partial => "confirm") }');
+$('##{dom_id(@tag)}').prepend('#{ j (render :partial => "confirm") }');
 }

data/app/views/admin/tags/create.js.haml

@@ -1,11 +1,11 @@
 - if @tag.valid?
-  jQuery('#create_tag_arrow').html(crm.COLLAPSED);
-  jQuery('#create_tag_title').html('#{ j t(:tags) }');
-  jQuery('#create_tag').slideUp(250);
-  jQuery('#tags').prepend('#{ j (render :partial => "tag", :collection => [ @tag ]) }');
-  jQuery('##{dom_id(@tag)}').effect("highlight", { duration:1500 });
+  $('#create_tag_arrow').html(crm.COLLAPSED);
+  $('#create_tag_title').html('#{ j t(:tags) }');
+  $('#create_tag').slideUp(250);
+  $('#tags').prepend('#{ j (render :partial => "tag", :collection => [ @tag ]) }');
+  $('##{dom_id(@tag)}').effect("highlight", { duration:1500 });
   crm.flick('empty', 'remove');
 - else
-  jQuery('#create_tag').html('#{ j render(:partial => 'new') }');
-  jQuery('#create_tag').effect("shake", { duration:250, distance: 6 });
-  jQuery('#tag_name').focus();
+  $('#create_tag').html('#{ j render(:partial => 'new') }');
+  $('#create_tag').effect("shake", { duration:250, distance: 6 });
+  $('#tag_name').focus();

data/app/views/admin/tags/destroy.js.haml

@@ -1,10 +1,10 @@
 - id = dom_id(@tag)
 
 - if @tag.destroyed?
-  jQuery('##{id}').css('background-color', '#ffe4e1').slideUp(250);
+  $('##{id}').css('background-color', '#ffe4e1').slideUp(250);
 - else
   crm.flick("#{dom_id(@tag, :confirm)}, 'remove')");
-  jQuery('##{id}').effect("shake", { duration:250, distance: 6 });
-  jQuery('#flash').html('#{ j flash[:warning] }');
+  $('##{id}').effect("shake", { duration:250, distance: 6 });
+  $('#flash').html('#{ j flash[:warning] }');
   crm.flash('warning');
   - flash[:warning] = nil

data/app/views/admin/tags/edit.js.haml

@@ -1,13 +1,13 @@
 - id = dom_id(@tag)
 
 - if params[:cancel].true?     # <----------------- Hide [Edit Tag]
-  jQuery('##{id}').replaceWith('#{ j render(:partial => "tag", :collection => [ @tag ]) }');
+  $('##{id}').replaceWith('#{ j render(:partial => "tag", :collection => [ @tag ]) }');
 
 - else # <----------------------------------------  Show [Edit Tag] form.
 
   - if @previous                                    # Hide open [Edit Tag] form if any.
     - if @previous.is_a?(Tag)                       # Previous tag still exists?
-      jQuery('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => "tag", :collection => [ @previous ]) }');
+      $('##{dom_id(@previous)}').replaceWith('#{ j render(:partial => "tag", :collection => [ @previous ]) }');
     - else
       crm.flick('tag_#{@previous}', 'remove');
 
@@ -16,5 +16,5 @@
   -# Show [Edit Tag] form.
   crm.highlight_off('#{id}');
   crm.hide_form('create_tag');
-  jQuery('##{id}').html('#{ j render(:partial => "edit") }');
-  jQuery('#tag_name').focus();
+  $('##{id}').html('#{ j render(:partial => "edit") }');
+  $('#tag_name').focus();