refinerycms 0.9.6.15 → 0.9.6.16

data/VERSION

@@ -1 +1 @@
-0.9.6.15
+0.9.6.16

data/config/application.rb

@@ -25,5 +25,5 @@ Refinery::Initializer.run do |config|
   }
 
   # Specify your application's gem requirements here. See the example below:
-  # config.gem "refinerycms-portfolio", :lib => "portfolio", :version => "~> 0.9.3.7"
+  # config.gem "refinerycms-portfolio", :lib => "portfolio", :version => "~> 0.9.3.8"
 end

data/public/javascripts/refinery/admin.js

@@ -35,21 +35,22 @@ init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').each(function(i, anchor)
   {
     $(anchor).click(function(e){
-      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "'></iframe>");
+      iframe = $("<iframe id='dialog_iframe' src='" + $(this).attr('href') + "&amp;app_dialog=true" + "'></iframe>");
       iframe.dialog({
         title: $(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null,
         modal: true,
         resizable: false,
         autoOpen: true,
         width: (parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0))||928),
-        height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473),
-        beforeclose: function(){$(document.body).removeClass('hide-overflow')}
+        height: (parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0))||473)/*,
+        beforeclose: function(){
+          $(document.body).removeClass('hide-overflow');
+        }*/
       });
       if ($.browser.msie) {
         iframe.css({'margin':'-2px 2px 2px -2px'});
-//        iframe..css('overflow: hidden');
       }
-      $(document.body).addClass('hide-overflow');
+      //$(document.body).addClass('hide-overflow');
       e.preventDefault();
     });
   });
@@ -204,16 +205,13 @@ var link_dialog = {
   },
 
   init_close: function(){
-    $('#TB_title .close_dialog, #dialog_container .close_dialog').click(function(e) {
-      e.preventDefault();
-
-      // if we're in a frame
-      if(parent && typeof(parent.tb_remove) == "function"){
-        parent.tb_remove();
-
-      } // if we're not in a frame
-      else if(typeof(tb_remove) == 'function'){
-        tb_remove();
+    $('#dialog-form-actions #cancel_button').click(function(e){
+      if (parent && typeof(parent.$) == "function") {
+    //    parent.$(document.body).removeClass('hide-overflow');
+        parent.$('.ui-dialog').dialog('close').remove();
+      } else {
+        $('.ui-dialog').dialog('close').remove();
+    //    $(document.body).removeClass('hide-overflow');
       }
     });
   },
@@ -516,30 +514,25 @@ var image_dialog = {
       this.callback(img_selected);
     }
 
-    if(parent && typeof(parent.tb_remove) == "function"){
-      parent.tb_remove();
-    }
-
+    this.close_dialog(e);
   }
 
-  , cancel_image_dialog: function(e) {
-    e.preventDefault();
-    // if we're in a frame
-    if(parent && typeof(parent.tb_remove) == "function"){
-      parent.tb_remove();
-
-    } // if we're not in a frame
-    else if(typeof(tb_remove) == 'function'){
-      tb_remove();
+  , close_dialog: function(e) {
+    if (parent && typeof(parent.$) == "function") {
+//      parent.parent.$(document.body).removeClass('hide-overflow');
+      parent.$('.ui-dialog').dialog('close').remove();
+    } else {
+      $('.ui-dialog').dialog('close').remove();
+//      $(document.body).removeClass('hide-overflow');
     }
+
+    e.preventDefault();
   }
 
   , init_actions: function(){
     var _this = this;
     $('#dialog-form-actions #submit_button').click($.proxy(_this.submit_image_choice, _this));
-    $('#dialog-form-actions #cancel_button, #TB_title .close_dialog, #dialog_container .close_dialog').click(
-      $.proxy(_this.cancel_image_dialog, _this)
-    );
+    $('#dialog-form-actions #cancel_button').click($.proxy(_this.close_dialog, _this));
   }
 }
 
@@ -643,6 +636,7 @@ var image_picker = {
                               .hide();
     $(this.options.field).val('');
     $(this.options.no_image_message).show();
+    $(this.options.remove_image_button).hide();
     $(this).hide();
   }
 

data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js

@@ -830,7 +830,6 @@ WYMeditor.editor.prototype.init = function() {
 
       //enable the skin
       this.loadSkin();
-
     }
 };
 
@@ -1537,6 +1536,9 @@ WYMeditor.editor.prototype.listen = function() {
   for(var i=0; i < images.length; i++) {
     $(images[i]).bind("mousedown", this.mousedown);
   }
+    
+  // ensure links can't be navigated to.
+  $(this._doc).find('a[href]').click(function(e){e.preventDefault();});
 };
 
 WYMeditor.editor.prototype.mousedown = function(evt) {
@@ -1762,6 +1764,9 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
 
   $("#" + wym._options.dialogId).dialog("close").remove();
 
+  // ensure links can't be navigated to.
+  $(this._doc).find('a[href]').click(function(e){e.preventDefault();});
+
   if (e) {
     e.preventDefault();
   }
@@ -4151,6 +4156,7 @@ WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
 
     //init designMode
     this._doc.designMode="on";
+    
     try{
       // (bermi's note) noticed when running unit tests on IE6
       // Is this really needed, it trigger an unexisting property on IE6

data/public/stylesheets/refinery/refinery.css

@@ -1167,7 +1167,6 @@ ul#plugins li {
     right: 0px;
     bottom: 0px;
     width: auto !important;
-    height: auto !important;
     opacity: .75;
     filter:Alpha(Opacity=75);
     background: #000;

data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb

@@ -8,7 +8,7 @@
 <%= f.hidden_field field, :id => "current_image_id_#{randomiser}" -%>
 
 <div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
-  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url %>?dialog=true&amp;modal=true&amp;titlebar=true&amp;callback=image_picker_<%= randomiser %>_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='dialog'>
+  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url(:dialog => true, :callback => "image_picker_#{randomiser}_changed", :width => 958, :height => 510) %>" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='dialog'>
     <% unless image.nil? -%>
       <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image_#{randomiser}"} %>
     <% else -%>

data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb

@@ -1,20 +1,7 @@
 <% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <%= stylesheet_link_tag 'refinery/refinery' %>
-    <% if (using_google_libs = RefinerySetting.find_or_set(:use_google_ajax_libraries, true)) and !local_request? -%>
-      <script type='text/javascript' src="http://www.google.com/jsapi"></script>
-      <script type='text/javascript'>
-        google.load("jquery", "1.4");
-        google.load("jqueryui", "1.8");
-      </script>
-    <% end %>
-    <%= javascript_include_tag('jquery.js', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : false)) if !using_google_libs or local_request? %>
-    <%= javascript_include_tag 'refinery/admin', :cache => (use_caching ? "cache/admin_dialog" : false) %>
-    <%= yield :head %>
-    <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
-  </head>
+  <%= render :partial => "/admin/head" %>
   <body id='dialog_container' class='dialog'>
     <div id="flash_container">
       <%= render :partial => '/shared/message' %>

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 6
-  - 15
-  version: 0.9.6.15
+  - 16
+  version: 0.9.6.16
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 +13:00
+date: 2010-03-02 00:00:00 +13:00
 default_executable: 
 dependencies: []