refinerycms-core 1.0.9 → 1.0.10

data/app/views/shared/admin/_resource_picker.html.erb

@@ -1,6 +1,18 @@
 <%
   conditions ||= nil
-  insert_text = "<span id='no_resource_selected_#{field}' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
+  if resource.present?
+    display_when_present = ""
+    hide_when_present = "display:none;"
+    file_title = "#{resource.title} (#{resource.file_name})"
+    resource_url = resource.url
+  else
+    display_when_present = "display:none;"
+    hide_when_present = ""
+    file_title = ""
+    resource_url = ""
+  end
+
+  insert_text = "<span id='no_resource_selected_#{field}' class='nothing_selected' style='#{hide_when_present}'>
                    #{t('.no_resource_selected')}
                  </span>".html_safe
   insert_link = insert_admin_resources_path({
@@ -9,32 +21,29 @@
                   :update_text => "current_resource_text_#{field}",
                   :callback => "resource_changed_#{field}",
                   :field => [f.object_name.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, ""), field].join('_'),
-                  :current_link => "#{resource.url if resource.present?}",
+                  :current_link => resource_url,
                   :height => 480,
                   :conditions => conditions
                 })
-              %>
+
+  linked_html = "#{refinery_icon_tag('page_white_put.png')} " + content_tag(:span, file_title, :id => "current_resource_text_#{field}")
+%>
+
 <%= f.hidden_field field %>
 <div>
   <%= link_to insert_text, insert_link,
               :name => t('.name'),
               :id => "current_resource_link_#{field}"
   %>
-  <div id='current_resource_container_<%= field %>' style='margin-top: 10px<%= ";display: none" unless resource.present? %>'>
-    <%= link_to "#{refinery_icon_tag('page_white_put.png')} ".html_safe +
-                content_tag(
-                  :span,
-                  "#{resource.title} (#{resource.file_name})",
-                  :id => "current_resource_text_#{field}"
-                ),
-                resource.url,
+  <div id='current_resource_container_<%= field %>' style='margin-top: 10px;<%= display_when_present %>'>
+    <%= link_to linked_html.html_safe, resource_url,
                 :id => "current_resource_#{field}",
-                :target => "_blank" if resource.present? %>
+                :target => "_blank" %>
   </div>
   <br/>
   <%= link_to t('.remove_current'), "",
               :id => "remove_resource_#{field}",
-              :style => "#{"display:none;" unless resource.present?}" %>
+              :style => display_when_present %>
 </div>
 
 <% content_for :javascripts do %>

data/config/locales/bg.yml

@@ -1,4 +1,7 @@
 bg:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   js:
     admin:
       confirm_changes: Всички промени, които сте направили ще бъдат загубени. Сигурни ли сте, че искате да продължите без запис?

data/config/locales/cs.yml

@@ -1,4 +1,7 @@
 cs:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/da.yml

@@ -1,4 +1,7 @@
 da:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/de.yml

@@ -1,4 +1,7 @@
 de:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/el.yml

@@ -1,4 +1,7 @@
 el:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/en.yml

@@ -1,4 +1,7 @@
 en:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   js:
     admin:
       confirm_changes: Any changes you've made will be lost. Are you sure you want to continue without saving?
@@ -76,3 +79,4 @@ en:
   time:
     formats:
       short: "%A, %d %B %Y"
+      

data/config/locales/es.yml

@@ -1,4 +1,7 @@
 es:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   welcome:
     there_are_no_users: "No hay usuarios registrados, así que debemos registrar al primero."
     remember_admin_location: "Recuerda que tu área administrativa de Refinery esta en:"

data/config/locales/fi.yml

@@ -1,4 +1,7 @@
 fi:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   js:
     admin:
       confirm_changes: "Kaikki muutoksesi menetetään. Oletko varma, että haluat jatkaa tallentamatta?"

data/config/locales/fr.yml

@@ -1,4 +1,7 @@
 fr:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/it.yml

@@ -1,4 +1,7 @@
 it:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery CMS

data/config/locales/jp.yml

@@ -1,4 +1,7 @@
 jp:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/lolcat.yml

@@ -1,4 +1,7 @@
 lolcat:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: REFINERY

data/config/locales/lt.yml

@@ -1,4 +1,7 @@
 lt:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/lv.yml

@@ -1,4 +1,7 @@
 lv:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/nb.yml

@@ -1,4 +1,7 @@
 nb:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/nl.yml

@@ -1,4 +1,7 @@
 nl:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/pl.yml

@@ -1,4 +1,7 @@
 pl:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/pt-BR.yml

@@ -1,4 +1,7 @@
 pt-BR:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/rs.yml

@@ -1,4 +1,7 @@
 rs:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/ru.yml

@@ -1,4 +1,7 @@
 ru:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/sk.yml

@@ -1,4 +1,7 @@
 sk:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/sl.yml

@@ -1,4 +1,7 @@
 sl:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   welcome:
     there_are_no_users: "Trenutno še ni nobenega uporabnika, zato vas moramo najprej namestiti."
     remember_admin_location: "Zapomnite si vaše administracijsko področje v Refinery je:"

data/config/locales/sv.yml

@@ -1,4 +1,7 @@
 sv:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/vi.yml

@@ -1,4 +1,7 @@
 vi:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/zh-CN.yml

@@ -1,4 +1,7 @@
 zh-CN:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/config/locales/zh-TW.yml

@@ -1,4 +1,7 @@
 zh-TW:
+  will_paginate:
+    previous_label: "«"
+    next_label: "»"
   plugins:
     refinery_core:
       title: Refinery

data/lib/gemspec.rb

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '~> 0.1'
+  s.add_dependency 'globalize3',                  '~> 0.2.0.beta4'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'rails',                       '~> 3.0.10'
   s.add_dependency 'truncate_html',               '~> 0.5'

data/lib/refinery/helpers/menu_helper.rb

@@ -86,6 +86,7 @@ module Refinery
         url = [page.url]
         url << ['', page.url[:path]].compact.flatten.join('/') if page.url.respond_to?(:keys)
         url = url.detect{|u| u.is_a?(String)}
+        url.chomp!('/') if url.size > 1
 
         # Now use all possible vectors to try to find a valid match,
         # finally passing to rails' "current_page?" method.

data/lib/refinery/plugin.rb

@@ -27,7 +27,7 @@ module Refinery
         def self.called_from; "#{new_called_from}"; end
       RUBY
       Object.const_set(plugin.class_name.to_sym, klass)
-      
+
       # add the new plugin to the collection of registered plugins
       ::Refinery::Plugins.registered << plugin
     end

data/lib/refinerycms-core.rb

@@ -161,11 +161,6 @@ module Refinery
         end if ::Rack.version <= '1.2.1'
       end
 
-      initializer 'set will_paginate link labels' do |app|
-        WillPaginate::ViewHelpers.pagination_options[:previous_label] = "&laquo;".html_safe
-        WillPaginate::ViewHelpers.pagination_options[:next_label] = "&raquo;".html_safe
-      end
-
       initializer 'ensure devise is initialised' do |app|
         unless Rails.root.join('config', 'initializers', 'devise.rb').file?
           load Refinery.roots('core').join(*%w(lib generators templates config initializers devise.rb))

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

@@ -1182,11 +1182,14 @@ WYMeditor.editor.prototype.switchTo = function(selectionOrNode,sType) {
   // we have a node.
   var html = $(selectionOrNode).html();
   var newNode = this._doc.createElement(sType);
+  var klass = $(selectionOrNode).attr('class');
 
   // copy across the css class names.
-  $.each($(selectionOrNode).attr('class').split(" "), function(index, className) {
-    $(newNode).addClass(className);
-  });
+  if(typeof klass !== 'undefined'){
+      $.each($(selectionOrNode).attr('class').split(" "), function(index, className) {
+        $(newNode).addClass(className);
+      });
+  }
 
   selectionOrNode.parentNode.replaceChild(newNode,selectionOrNode);
 
@@ -1278,7 +1281,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
   var wym = this;
 
   wym.update();
-  var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true';
+  var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}/);
 
   wym._current_unique_stamp = wym.uniqueStamp();
   // change undo or redo on cancel to true to have this happen when a user closes (cancels) a dialogue
@@ -1394,6 +1397,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
       if (!wym._selected_image) {
         parent_node._id_before_replaceable = parent_node.id;
         parent_node.id = '' + this._current_unique_stamp;
+        $(parent_node).attr("_id_before_replaceable", parent_node._id_before_replaceable);
       }
 
       if (dialogType != WYMeditor.DIALOG_PASTE && dialogType != WYMeditor.DIALOG_TABLE) {
@@ -1770,7 +1774,7 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
 
   var selected = selected || wym.selected();
   var dialog = $("#"+wym._options.dialogId);
-  var doc = $((isIframe ? dialog.find('iframe').contents() : document));
+  var doc = $(dialog.find('iframe').contents());
   var dialogType = dialog.find('#wym_dialog_type').val();
   if (wym._selected_image) {
     var replaceable = $(wym._selected_image);
@@ -1866,7 +1870,7 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
       (image = $(wym._doc.createElement("IMG")))
         .attr(WYMeditor.SRC, url)
         .attr(WYMeditor.TITLE, form.find(wym._options.titleSelector).val())
-        .attr(WYMeditor.ALT, form.find(wym._options.titleSelector).val())
+        .attr(WYMeditor.ALT, form.find(wym._options.altSelector).val())
         .attr(WYMeditor.REL, form.find(wym._options.sizeSelector).val())
         .load(function(e){
           $(this).attr({
@@ -1938,9 +1942,12 @@ WYMeditor.editor.prototype.close_dialog = function(e, cancelled) {
     if ((span = $(this._doc.body).find('span#' + this._current_unique_stamp)).length > 0) {
       span.parent().html(span.parent().html().replace(new RegExp(["<span(.+?)", span.attr('id'), "(.+?)<\/span>"].join("")), span.html()));
     }
-    (remove_id = $(this._doc.body).find('#' + this._current_unique_stamp))
-      .attr('id', (remove_id.attr('_id_before_replaceable') || ""))
-      .replaceWith(remove_id.html());
+    // https://github.com/resolve/refinerycms/issues/888
+    if (node = $(this._doc.body).find('#' + this._current_unique_stamp)) {
+      node.attr("id", (node.attr('_id_before_replaceable') || ""));
+      node.removeAttr("_id_before_replaceable");
+    }
+
     if (this._undo_on_cancel == true) {
       this._exec("undo");
     }
@@ -2295,7 +2302,7 @@ WYMeditor.XhtmlValidator = {
         "2":"href",
         "3":"hreflang",
         "4":"name",
-        "rel":/^(alternate|designates|stylesheet|start|next|prev|contents|index|glossary|copyright|chapter|section|subsection|appendix|help|bookmark| |shortcut|icon|moodalbox)+$/,
+        "rel":/^(alternate|designates|stylesheet|start|next|nofollow|prev|contents|index|glossary|copyright|chapter|section|subsection|appendix|help|bookmark| |shortcut|icon|moodalbox)+$/,
         "rev":/^(alternate|designates|stylesheet|start|next|prev|contents|index|glossary|copyright|chapter|section|subsection|appendix|help|bookmark| |shortcut|icon|moodalbox)+$/,
         "shape":/^(rect|rectangle|circ|circle|poly|polygon)$/,
         "5":"type",
@@ -2484,7 +2491,7 @@ WYMeditor.XhtmlValidator = {
         "readonly":/^(readonly)$/,
         "size":/^(\d)+$/,
         "3":"src",
-        "type":/^(button|checkbox|file|hidden|image|password|radio|reset|submit|text|tel|search|url|email|datetime|date|month|week|time|datetime-local|number|range|color)$/,
+        "type":/^(button|checkbox|file|hidden|image|password|radio|reset|submit|text|tel|search|url|email|datetime|date|month|week|time|datetime-local|number|range|color|placeholder)$/,
         "4":"value"
       },
       "inside":"form"
@@ -2517,7 +2524,7 @@ WYMeditor.XhtmlValidator = {
         "media":/^(all|braille|print|projection|screen|speech|,|;| )+$/i,
         //next comment line required by Opera!
         /*"rel":/^(alternate|appendix|bookmark|chapter|contents|copyright|glossary|help|home|index|next|prev|section|start|stylesheet|subsection| |shortcut|icon)+$/i,*/
-        "rel":/^(alternate|appendix|bookmark|chapter|contents|copyright|glossary|help|home|index|next|prev|section|start|stylesheet|subsection| |shortcut|icon)+$/i,
+        "rel":/^(alternate|appendix|bookmark|chapter|contents|copyright|glossary|help|home|index|next|nofollow|prev|section|start|stylesheet|subsection| |shortcut|icon)+$/i,
         "rev":/^(alternate|appendix|bookmark|chapter|contents|copyright|glossary|help|home|index|next|prev|section|start|stylesheet|subsection| |shortcut|icon)+$/i,
         "3":"type"
       },
@@ -4341,30 +4348,28 @@ function titleize(words) {
  */
 
 WYMeditor.WymClassExplorer = function(wym) {
-
     this._wym = wym;
     this._class = "className";
     this._newLine = "\r\n";
-
 };
 
 WYMeditor.WymClassExplorer.prototype.format_block = function(selected) {
 
-  //'this' should be the wymeditor instance.
-  var wym = this;
-  var container = selected || wym.selected() || $(wym._iframe).contents().find('body').get(0);
-  var name = container.tagName.toLowerCase();
+    //'this' should be the wymeditor instance.
+    var wym = this;
+    var container = selected || wym.selected() || $(wym._iframe).contents().find('body').get(0);
+    var name = container.tagName.toLowerCase();
 
-  //fix forbidden main containers
-  if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a']) > -1) {
-    name = container.parentNode.tagName.toLowerCase();
-  }
+    //fix forbidden main containers
+    if($.inArray(name, ['strong', 'b', 'em', 'i', 'sub', 'sup', 'a']) > -1) {
+        name = container.parentNode.tagName.toLowerCase();
+    }
 
-  if(name == WYMeditor.BODY) {
-    wym._selected_image = null;
-    $(wym._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
-    wym._exec(WYMeditor.FORMAT_BLOCK, "<" + WYMeditor.P + ">");
-  }
+    if(name == WYMeditor.BODY) {
+        wym._selected_image = null;
+        $(wym._iframe).contents().find('.selected_by_wym').removeClass('selected_by_wym');
+        wym._exec(WYMeditor.FORMAT_BLOCK, "<" + WYMeditor.P + ">");
+    }
 };
 
 WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
@@ -4444,48 +4449,46 @@ WYMeditor.WymClassExplorer.prototype.initIframe = function(iframe) {
 
 WYMeditor.WymClassExplorer.prototype._exec = function(cmd,param) {
 
-    switch(cmd) {
+  var wym = this;
 
+  switch(cmd) {
     case WYMeditor.INDENT: case WYMeditor.OUTDENT:
-
-        var container = this.findUp(this.container(), WYMeditor.LI);
-        if(container) {
-            var ancestor = container.parentNode.parentNode;
-            if(container.parentNode.childNodes.length>1
-              || ancestor.tagName.toLowerCase() == WYMeditor.OL
-              || ancestor.tagName.toLowerCase() == WYMeditor.UL)
-              this._doc.execCommand(cmd);
+      var container = wym.findUp(wym.container(), WYMeditor.LI);
+      if(container) {
+        var ancestor = container.parentNode.parentNode;
+        if(container.parentNode.childNodes.length > 1 || $.inArray(ancestor.tagName.toLowerCase(), [WYMeditor.OL, WYMeditor.UL]) > -1) {
+          wym._doc.execCommand(cmd);
         }
-    break;
+      }
+      break;
     default:
-        if(param) this._doc.execCommand(cmd,false,param);
-        else this._doc.execCommand(cmd);
-    break;
+      if(param) {
+        wym._doc.execCommand(cmd,false,param);
+      }
+      else {
+        wym._doc.execCommand(cmd);
+      }
+      break;
   }
 
 };
 
 WYMeditor.WymClassExplorer.prototype.selected = function() {
-
     var caretPos = this._iframe.contentWindow.document.caretPos;
-        if(caretPos!=null) {
-            if(caretPos.parentElement!=undefined)
-              return(caretPos.parentElement());
-        }
+    if(caretPos != null && caretPos.parentElement != undefined) {
+        return(caretPos.parentElement());
+    }
 };
 
 WYMeditor.WymClassExplorer.prototype.saveCaret = function() {
-
     this._doc.caretPos = this._doc.selection.createRange();
 };
 
 WYMeditor.WymClassExplorer.prototype.addCssRule = function(styles, oCss) {
-
     styles.addRule(oCss.name, oCss.css);
 };
 
 WYMeditor.WymClassExplorer.prototype.insert = function(html) {
-
     // Get the current selection
     var range = this._doc.selection.createRange();
 
@@ -4657,7 +4660,9 @@ WYMeditor.WymClassMozilla.prototype.html = function(html) {
     //re-init designMode
     this.enableDesignMode();
   }
-  else return($(this._doc.body).html());
+  else {
+    return($(this._doc.body).html());
+  }
 };
 
 WYMeditor.WymClassMozilla.prototype._exec = function(cmd,param) {
@@ -4670,7 +4675,9 @@ WYMeditor.WymClassMozilla.prototype._exec = function(cmd,param) {
       var focusNode = this.selected();
       var sel = this._iframe.contentWindow.getSelection();
       var anchorNode = sel.anchorNode;
-      if(anchorNode.nodeName == "#text") anchorNode = anchorNode.parentNode;
+      if(anchorNode.nodeName == "#text") {
+        anchorNode = anchorNode.parentNode;
+      }
 
       focusNode = this.findUp(focusNode, WYMeditor.BLOCKS);
       anchorNode = this.findUp(anchorNode, WYMeditor.BLOCKS);
@@ -4678,10 +4685,9 @@ WYMeditor.WymClassMozilla.prototype._exec = function(cmd,param) {
       if(focusNode && focusNode == anchorNode && focusNode.tagName.toLowerCase() == WYMeditor.LI) {
         var ancestor = focusNode.parentNode.parentNode;
 
-        if(focusNode.parentNode.childNodes.length>1
-        || ancestor.tagName.toLowerCase() == WYMeditor.OL
-        || ancestor.tagName.toLowerCase() == WYMeditor.UL)
-         this._doc.execCommand(cmd,'',null);
+        if(focusNode.parentNode.childNodes.length > 1 || $.inArray(ancestor.tagName.toLowerCase(), [WYMeditor.OL, WYMeditor.UL]) > -1) {
+          this._doc.execCommand(cmd,'',null);
+        }
       }
     break;
 
@@ -4692,8 +4698,9 @@ WYMeditor.WymClassMozilla.prototype._exec = function(cmd,param) {
 
     //set to P if parent = BODY
     var container = this.selected();
-    if(container.tagName.toLowerCase() == WYMeditor.BODY)
+    if(container.tagName.toLowerCase() == WYMeditor.BODY) {
         this._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P);
+    }
 };
 
 
@@ -4730,9 +4737,13 @@ WYMeditor.WymClassMozilla.prototype.selected = function(upgrade_text_nodes) {
           return node.parentNode;
         }
       }
-      else return(node);
+      else {
+        return(node);
+      }
+  }
+  else {
+    return(null);
   }
-  else return(null);
 };
 
 WYMeditor.WymClassMozilla.prototype.addCssRule = function(styles, oCss) {
@@ -4914,8 +4925,12 @@ WYMeditor.WymClassOpera.prototype.selected = function() {
   var sel=this._iframe.contentWindow.getSelection();
   var node=sel.focusNode;
   if(node) {
-    if(node.nodeName=="#text")return(node.parentNode);
-    else return(node);
+    if(node.nodeName=="#text") {
+      return(node.parentNode);
+    }
+    else {
+      return(node);
+    }
   } else {
     return(null);
   }
@@ -5029,29 +5044,33 @@ WYMeditor.WymClassSafari.prototype.initIframe = function(iframe) {
 
 WYMeditor.WymClassSafari.prototype._exec = function(cmd,param) {
 
-    if(!this.selected()) return(false);
+    var wym = this;
+    if(!wym.selected()) {
+      return(false);
+    }
 
     switch(cmd) {
 
     case WYMeditor.INDENT: case WYMeditor.OUTDENT:
 
-        var focusNode = this.selected();
-        var sel = this._iframe.contentWindow.getSelection();
+        var focusNode = wym.selected();
+        var sel = wym._iframe.contentWindow.getSelection();
         var anchorNode = sel.anchorNode;
-        if(anchorNode.nodeName == "#text") anchorNode = anchorNode.parentNode;
+        if(anchorNode.nodeName == "#text") {
+          anchorNode = anchorNode.parentNode;
+        }
 
-        focusNode = this.findUp(focusNode, WYMeditor.BLOCKS);
-        anchorNode = this.findUp(anchorNode, WYMeditor.BLOCKS);
+        focusNode = wym.findUp(focusNode, WYMeditor.BLOCKS);
+        anchorNode = wym.findUp(anchorNode, WYMeditor.BLOCKS);
 
         if(focusNode && focusNode == anchorNode
           && focusNode.tagName.toLowerCase() == WYMeditor.LI) {
 
             var ancestor = focusNode.parentNode.parentNode;
 
-            if(focusNode.parentNode.childNodes.length>1
-              || ancestor.tagName.toLowerCase() == WYMeditor.OL
-              || ancestor.tagName.toLowerCase() == WYMeditor.UL)
-                this._doc.execCommand(cmd,'',null);
+            if(focusNode.parentNode.childNodes.length > 1 || $.inArray(ancestor.tagName.toLowerCase(), [WYMeditor.OL, WYMeditor.UL]) > -1) {
+                wym._doc.execCommand(cmd,'',null);
+            }
         }
 
     break;
@@ -5073,9 +5092,6 @@ WYMeditor.WymClassSafari.prototype._exec = function(cmd,param) {
       else this._doc.execCommand(cmd,'',null);
     }
 
-    //set to P if parent = BODY
-    this.format_block();
-
 };
 
 /* @name selected
@@ -5199,7 +5215,7 @@ WYMeditor.WymClassSafari.prototype.keyup = function(e) {
         name = container.parentNode.tagName.toLowerCase();
       }
 
-      if(name == WYMeditor.BODY || name == WYMeditor.DIV) {
+      if($.inArray(name, [WYMeditor.BODY, WYMeditor.DIV]) > -1) {
         wym._exec(WYMeditor.FORMAT_BLOCK, WYMeditor.P); //fix #110 for DIV
       }
     }

data/public/stylesheets/refinery/refinery.css

@@ -1551,6 +1551,31 @@ a.information:hover {
   -webkit-border-radius: 6px;
 }
 
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  white-space: nowrap;
+  background-color: #bfbfbf;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.label.important {
+  background-color: #c43c35;
+}
+.label.warning {
+  background-color: #f89406;
+}
+.label.success {
+  background-color: #46a546;
+}
+.label.notice {
+  background-color: #62cffc;
+}
+
 /* Internet Explorer to follow: */
 /* IE 7 */
 .ie7 #content .form-actions .form-actions-left a.button {

data/refinerycms-core.gemspec

@@ -3,10 +3,10 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-core}
-  s.version           = %q{1.0.9}
+  s.version           = %q{1.0.10}
   s.summary           = %q{Core engine for Refinery CMS}
   s.description       = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
-  s.date              = %q{2011-11-05}
+  s.date              = %q{2012-03-06}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}
@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
   s.require_paths     = %w(lib)
   s.executables       = %w()
 
-  s.add_dependency 'refinerycms-base',            '= 1.0.9'
-  s.add_dependency 'refinerycms-settings',        '= 1.0.9'
+  s.add_dependency 'refinerycms-base',            '= 1.0.10'
+  s.add_dependency 'refinerycms-settings',        '= 1.0.10'
   s.add_dependency 'refinerycms-generators',      '~> 1.0'
   s.add_dependency 'acts_as_indexed',             '~> 0.7'
   s.add_dependency 'friendly_id_globalize3',      '~> 3.2.1'
-  s.add_dependency 'globalize3',                  '~> 0.1'
+  s.add_dependency 'globalize3',                  '~> 0.2.0.beta4'
   s.add_dependency 'awesome_nested_set',          '~> 2.0'
   s.add_dependency 'rails',                       '~> 3.0.10'
   s.add_dependency 'truncate_html',               '~> 0.5'

data/spec/lib/refinery/plugins_spec.rb

@@ -97,7 +97,7 @@ module Refinery
       it 'identifies as Refinery::Plugins' do
         subject.class.active.class.should == subject.class
       end
-      
+
       it 'only contains items that are registered' do
         subject.class.set_active(%w(my_plugin))
         subject.class.active.any?.should be_true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-core
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Resolve Digital
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-05 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-base
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
         - 0
-        - 9
-        version: 1.0.9
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -45,12 +45,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 3
         segments: 
         - 1
         - 0
-        - 9
-        version: 1.0.9
+        - 10
+        version: 1.0.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -107,11 +107,14 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: -38949664
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 2
+        - 0
+        - beta
+        - 4
+        version: 0.2.0.beta4
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -559,9 +562,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Core engine for Refinery CMS
 test_files: []
 
+has_rdoc: