Merge pull request #200 from masche842/fixes_master

more namespaced selectboxes
AlchemyCMS · Mar 5, 2012 · 31835dd · 31835dd
2 parents 46a790c + 75a1780
commit 31835dd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/app/assets/javascripts/alchemy/alchemy.link_overlay.js b/app/assets/javascripts/alchemy/alchemy.link_overlay.js
@@ -27,7 +27,7 @@ if (typeof(Alchemy) === 'undefined') {
             url: Alchemy.routes.link_admin_pages_path,
             success: function(data, textStatus, XMLHttpRequest) {
               $dialog.html(data);
-              Alchemy.SelectBox('#alchemyLinkOverlay select');
+              Alchemy.SelectBox('#alchemyLinkOverlay select.alchemy_selectbox');
             },
             error: function(XMLHttpRequest, textStatus, errorThrown) {
               Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);

diff --git a/app/assets/javascripts/alchemy/alchemy.windows.js b/app/assets/javascripts/alchemy/alchemy.windows.js
@@ -162,7 +162,7 @@ if (typeof(Alchemy) === 'undefined') {
 									top: ($(window).height() - $dialog.dialog('widget').height()) / 2
 								});
 							}
-							Alchemy.SelectBox('#alchemyOverlay select');
+							Alchemy.SelectBox('#alchemyOverlay select.alchemy_selectbox');
 							Alchemy.Datepicker('#alchemyOverlay input.date, #alchemyOverlay input[type="date"]');
 							Alchemy.ButtonObserver('#alchemyOverlay .button');
 						},

diff --git a/app/views/layouts/alchemy/login.html.erb b/app/views/layouts/alchemy/login.html.erb
@@ -31,7 +31,7 @@
 		<script type="text/javascript" charset="utf-8">
 			jQuery(document).ready(function($) {
 				$('html').removeClass('no-js');
-				Alchemy.SelectBox('body#alchemy select');
+				Alchemy.SelectBox('body#alchemy select.alchemy_selectbox');
 				Alchemy.ButtonObserver('.button');
 			});
 		</script>