alchemy_cms 2.2.1 → 2.2.2

data/app/assets/javascripts/alchemy/alchemy.windows.js

@@ -290,7 +290,7 @@ if (typeof(Alchemy) === 'undefined') {
         var $this = $(this);
         var options = $this.data('alchemy-overlay');
         event.preventDefault();
-        Alchemy.openWindow($this.attr('href'), options.title, options.size_x, options.size_y, options.resizable, options.overflow);
+        Alchemy.openWindow($this.attr('href'), options.title, options.size_x, options.size_y, options.resizable, options.modal, options.overflow);
         return false;
       });
 

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -51,7 +51,7 @@ module Alchemy
     end
 
     def leave
-      ::I18n.locale = current_user.language.to_sym
+      ::I18n.locale = current_user.try(:language)
       render :layout => false
     end
 

data/app/views/alchemy/admin/pages/destroy.js.erb

@@ -0,0 +1,20 @@
+$('#locked_page_<%= @page_id -%>').remove();
+
+<% if @layoutpage %>
+
+window.location.replace('<%= alchemy.admin_layoutpages_path -%>');
+
+<% elsif @page_root %>
+
+$('#sitemap').replaceWith('<%= escape_javascript(render(:partial => "sitemap")) -%>');
+Alchemy.growl('<%= @message -%>');
+Alchemy.Tooltips();
+Alchemy.overlayObserver('#sitemap');
+
+<% else %>
+
+window.location.replace('<%= alchemy.admin_pages_path -%>');
+
+<% end %>
+
+Alchemy.pleaseWaitOverlay(false);

data/lib/alchemy/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
 
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -568,7 +568,7 @@ files:
 - app/views/alchemy/admin/pages/_sitemap.html.erb
 - app/views/alchemy/admin/pages/configure.html.erb
 - app/views/alchemy/admin/pages/configure_external.html.erb
-- app/views/alchemy/admin/pages/destroy.js.coffee
+- app/views/alchemy/admin/pages/destroy.js.erb
 - app/views/alchemy/admin/pages/edit.html.erb
 - app/views/alchemy/admin/pages/flush.js.erb
 - app/views/alchemy/admin/pages/fold.js.erb
@@ -1039,7 +1039,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3374243950541601124
+      hash: -4110800022102781738
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 

data/app/views/alchemy/admin/pages/destroy.js.coffee

@@ -1,19 +0,0 @@
-$('#locked_page_<%= @page_id -%>').remove()
-
-<% if @layoutpage %>
-
-window.location.replace '<%= alchemy.admin_layoutpages_path -%>'
-
-<% elsif @page_root %>
-
-$('#sitemap').replaceWith '<%= escape_javascript(render(:partial => "sitemap")) -%>'
-Alchemy.growl '<%= @message -%>'
-Alchemy.Tooltips()^
-
-<% else %>
-
-window.location.replace '<%= alchemy.admin_pages_path -%>'
-
-<% end %>
-
-Alchemy.pleaseWaitOverlay false