Removed ActiveRecord#dom_id extension.

svenfuchs · Sep 24, 2008 · c261fa5 · c261fa5
1 parent cafb2aa
commit c261fa5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/public/javascripts/admin/asset_widget.js b/public/javascripts/admin/asset_widget.js
@@ -74,7 +74,7 @@ var AssetWidget = {
 		}
   },
 	isAttached: function(element) {
-		return $('attached-asset-' + this.assetId(element)) ? true : false;
+		return $('attached_asset_' + this.assetId(element)) ? true : false;
 	},
 	updateSelected: function() {
 		if(!$('assets-widget')) return;
@@ -104,7 +104,7 @@ var AssetWidget = {
 				asset.removeClassName('selected'); 
 			});
 			ids.each(function(id) { 			
-				var asset = $(prefix + '-asset-' + id);
+				var asset = $(prefix + '_asset_' + id);
 				if (asset) { asset.addClassName('selected'); }
 		  });
 		}.bind(this));		
@@ -114,11 +114,11 @@ var AssetWidget = {
 	},	
   showAttachTools: function(id) {
     if(this.isEdit()) {
-		  ['attach', 'detach'].each(function(prefix){ $(prefix + '-' + id).show(); })
+		  ['attach', 'detach'].each(function(prefix){ $(prefix + '_' + id).show(); })
     }
   },  
   hideAttachTools: function(id) {
-		['attach', 'detach'].each(function(prefix){ $(prefix + '-' + id).hide(); })
+		['attach', 'detach'].each(function(prefix){ $(prefix + '_' + id).hide(); })
   },
 	search: function(query) {
     if(!query) return;

diff --git a/vendor/engines/adva_assets/app/views/admin/assets/widget/_asset.html.erb b/vendor/engines/adva_assets/app/views/admin/assets/widget/_asset.html.erb
@@ -1,7 +1,7 @@
-<li id="<%= asset.dom_id("#{prefix}-asset") %>" class="asset <%= prefix %>-asset <%= ' selected' if content and content.assets.include?(asset) %>">
+<li id="<%= dom_id(asset, prefix) %>" class="asset <%= prefix %>-asset <%= ' selected' if content and content.assets.include?(asset) %>">
   <%= link_to asset_image_for(asset), asset.public_filename %>
   <div>
-    <a href="#"><%= image_tag('/images/icons/add.png', :size => '16x16', :id => asset.dom_id("attach-#{prefix}-asset"), :style => 'display: none', :class => 'attach-asset') %></a>
-    <a href="#"><%= image_tag('/images/icons/delete.png', :size => '16x16', :id => asset.dom_id("detach-#{prefix}-asset"), :style => 'display: none', :class => 'detach-asset') %></a>
+    <a href="#"><%= image_tag('/images/icons/add.png', :size => '16x16', :id => dom_id(asset, "attach_#{prefix}"), :style => 'display: none', :class => 'attach-asset') %></a>
+    <a href="#"><%= image_tag('/images/icons/delete.png', :size => '16x16', :id => dom_id(asset, "detach_#{prefix}"), :style => 'display: none', :class => 'detach-asset') %></a>
   </div>  
 </li>
diff --git a/vendor/engines/adva_cms/init.rb b/vendor/engines/adva_cms/init.rb
@@ -7,7 +7,6 @@
 require 'core_ext/hash'
 require 'core_ext/kernel'
 require 'core_ext/string'
-require 'rails_ext/active_record/dom_id'
 require 'rails_ext/active_record/sti_instantiation'
 
 require 'routing'

diff --git a/vendor/engines/adva_cms/lib/rails_ext/active_record/dom_id.rb b/vendor/engines/adva_cms/lib/rails_ext/active_record/dom_id.rb