refinerycms-core 2.0.10 → 2.1.0

data/app/assets/javascripts/refinery/refinery.js.erb

@@ -2,19 +2,18 @@
  *= require jquery
  *= require jquery_ujs
  *= require jquery-ui
- *= require ../modernizr-min
- *= require ../jquery/jquery.corner
- *= require ../jquery/jquery.textTruncate
- *= require ../jquery/jquery.html5-placeholder-shim
- *= require ../jquery/jquery.timers
- *= require ../jquery/jquery.jcarousel
- *= require ../admin
- *= require ./core
- *= require ./site_bar
- *= require ./admin
- *= require ./submenu
- *= require ./interface
- *= require ./sortable_menu
- *= require ./submit_continue
- *= require ./ajaxy_pagination
+ *= require modernizr-min
+ *= require jquery/jquery.html5-placeholder-shim
+ *= require jquery/jquery.timers
+ *= require jquery/jquery.jcarousel
+ *= require jquery/jquery.browser
+ *= require admin
+ *= require refinery/core
+ *= require refinery/site_bar
+ *= require refinery/admin
+ *= require refinery/submenu
+ *= require refinery/interface
+ *= require refinery/sortable_menu
+ *= require refinery/submit_continue
+ *= require refinery/ajaxy_pagination
 */

data/app/assets/javascripts/refinery/site_bar.js

@@ -1,14 +1,8 @@
-(function($) {
+$(function() {
   $logo = $('#site_bar_content #site_bar_refinery_cms_logo');
   $logo.css('left', ($('#site_bar_content').width() / 2) - ($logo.width() / 2));
 
   $switch_anchor = $('#editor_switch a').not('.ie7 #editor_switch a, .ie6 #editor_switch a');
-  if ($.isFunction($switch_anchor.corner)) {
-    $switch_anchor.corner('6px');
-  }
 
-  $('#editor_switch a').appendTo((span = $('<span></span>').prependTo('#editor_switch')));
-  if ($.isFunction(span.corner)) {
-    span.corner('6px');
-  }
-})(jQuery);
+  $('#editor_switch a').appendTo($('<span></span>').prependTo('#editor_switch'));
+});

data/app/assets/javascripts/refinery/sortable_list.js

@@ -0,0 +1,145 @@
+var create_sortable_list = function(options){
+    ordered_list = {
+        initialised: false
+        , init: function(options) {
+            if(!this.initialised){
+                this.update_url = options.update_url;
+                this.sortable_list = options.sortable_list;
+                this.tree = options.tree;
+                this.replaceContentsAfterUpdate = options.replaceContentsAfterUpdate;
+
+                //setup dom
+                this.div_with_list_and_actions = this.sortable_list.parents().filter(function(index) {
+                    return ($(this).children("#actions").length > 0);
+                });
+                this.actions = $("#actions",this.div_with_list_and_actions);
+                this.reorder_action = $('#reorder_action',this.actions);
+                this.reorder_action_done = $('#reorder_action_done',this.actions);
+
+
+                this.sortable_list.addClass("sortable_list");
+                this.reorder_action.click($.proxy(this.enable_reordering, {list: this}));
+                this.reorder_action_done.click($.proxy(this.disable_reordering, {list: this}));
+
+                if(this.tree == false){
+                    this.sortable_list.find('li').addClass('no-nest');
+                }
+
+                this.sortable_list.nestedSortable({
+                    listType: 'ul',
+                    disableNesting: 'no-nest',
+                    forcePlaceholderSize: true,
+                    handle: this.tree ? 'div' : null,
+                    items: 'li',
+                    opacity: .6,
+                    placeholder: 'placeholder',
+                    tabSize: 25,
+                    tolerance: 'pointer',
+                    toleranceElement: this.tree ? '> div' : null,
+                    disabled: true,
+                    start: function () {
+                    },
+                    change: $.proxy(this.change, {list: this}),
+                    stop: $.proxy(this.stop, {list: this})
+                });
+                if (this.tree) {
+                    this.reset_branch_classes(this.sortable_list);
+                } else {
+                    this.reset_on_off_classes(this.sortable_list);
+                }
+                this.initialised = true;
+            }
+            return this;
+        }
+        , stop: function() {
+            this.list.reset_classes();
+        }
+        , change: function() {
+            if (this.list.tree) {
+                this.list.reset_branch_classes(this.list.sortable_list)
+            }
+        }
+        , reset_classes: function(){
+            if (this.tree) {
+                this.reset_branch_classes(this.sortable_list);
+                this.reset_icon_classes(this.sortable_list);
+            } else {
+                this.reset_on_off_classes(this.sortable_list);
+            }
+        }
+        , reset_on_off_classes: function(ul) {
+            $("> li", ul).each(function(i, li) {
+                $(li).removeClass('on off on-hover').addClass(i % 2 === 0 ? 'on' : 'off');
+            });
+        }
+
+        , reset_branch_classes: function (ul) {
+            $("li.ui-sortable-helper", this).removeClass("record").removeClass("branch_start").removeClass("branch_end");
+            $("li", ul).removeClass("branch_start").removeClass("branch_end");
+
+            $("> li:first", ul).addClass("branch_start");
+            $("> li:last", ul).addClass("branch_end");
+
+            var nested_ul = $("ul", ul);
+            $("> li:last", nested_ul).addClass("branch_end");
+        }
+
+        , reset_icon_classes: function(ul) {
+            $('li', ul).each(function() {
+                var $li   = $(this);
+                var $icon = $li.find('.icon:first');
+
+                if ($li.find('ul li').size() > 0) {
+                    $icon.addClass('toggle expanded');
+                }
+                else if ($icon.hasClass('expanded')){
+                    $icon.removeClass('toggle expanded');
+                }
+            });
+        }
+
+        , enable_reordering: function(e) {
+            if(e) { e.preventDefault(); }
+            this.list.sortable_list.addClass("reordering");
+            $('.actions', this.list.sortable_list).fadeTo(500, 0.3);
+            this.list.div_with_list_and_actions.parents().siblings('div').fadeTo(500,0.3);
+            $('*:not("#reorder_action_done, #reorder_action")',this.list.actions).not(this.list.reorder_action_done.parents('li, ul, div')).fadeTo(500, 0.55);
+            this.list.sortable_list.nestedSortable("enable");
+            this.list.reorder_action.hide();
+            this.list.reorder_action_done.show();
+        }
+        , disable_reordering: function(e){
+            if(e) { e.preventDefault(); }
+
+            if(this.list.reorder_action_done.hasClass('loading')){ return false; }
+
+            this.list.reorder_action_done.addClass('loading');
+            this.list.sortable_list.nestedSortable("disable");
+            this.list.sortable_list.removeClass("reordering");
+
+            if (this.list.update_url !== null) {
+                var serialized = this.list.sortable_list.serializelist();
+
+                $.post(this.list.update_url, serialized, $.proxy(this.list.restore_controls,{list: this.list}));
+            } else {
+                $.proxy(this.list.restore_controls,{list: this.list})();
+            }
+        }
+
+        , restore_controls: function(e) {
+            this.list.sortable_list.removeClass('reordering');
+            $('.actions',this.list.sortable_list).fadeTo(250, 1);
+            this.list.div_with_list_and_actions.parents().siblings('div').fadeTo(250,1);
+            $('*:not("#reorder_action_done, #reorder_action")',this.list.actions).not($('#reorder_action_done').parents('li, ul, div')).fadeTo(250, 1);
+            this.list.reorder_action_done.hide().removeClass('loading');
+            this.list.reorder_action.show();
+            if (this.list.replaceContentsAfterUpdate) {
+                this.list.sortable_list.children().remove();
+                this.list.sortable_list.append($(e).children());
+                this.list.reset_classes();
+            }
+        }
+    }
+    ordered_list.init(options);
+    return ordered_list;
+};

data/app/assets/javascripts/refinery/sortable_menu.js.coffee

@@ -2,11 +2,12 @@
   $menu = $("#menu")
   return  if $menu.length == 0
   $menu.sortable(
+    items: "> *:not(#menu_reorder, #menu_reorder_done)"
     axis: "x"
     cursor: "crosshair"
     connectWith: ".nested"
     update: ->
-      $.post "/refinery/update_menu_positions", $menu.sortable("serialize", 
+      $.post "/refinery/update_menu_positions", $menu.sortable("serialize",
         key: "menu[]"
         expression: /plugin_([\w]*)$/
       )
@@ -14,8 +15,6 @@
   $menu.sortable "disable"
   $menu.find("#menu_reorder").click (e) ->
     trigger_reordering e, true
-  
+
   $menu.find("#menu_reorder_done").click (e) ->
     trigger_reordering e, false
-  
-  $menu.find("> a").corner "top 5px"

data/app/assets/javascripts/refinery/submit_continue.js.coffee.erb

@@ -6,8 +6,7 @@
 
   if (continue_editing_button = $("#continue_editing")).length > 0 and continue_editing_button.attr("rel") != "no-prompt"
     $("#editor_switch a").click (e) ->
-      if $("form[data-changes-made]").length > 0
-        e.preventDefault() unless confirm("<%= ::I18n.t('confirm_changes', :scope => 'refinery.js.admin') %>")
+      e.preventDefault()  unless confirm("<%= ::I18n.t("js.admin.confirm_changes") %>")  if $("form[data-changes-made]").length > 0
 
   $("input[id=page_custom_slug]").change ->
     $("#submit_continue_button").remove()

data/app/assets/javascripts/refinery/tree.js

@@ -1,6 +1,6 @@
 $(function() {
-  $('.tree .toggle').live('click', function(e) { 
-    e.preventDefault(); 
+  $('.tree').on('click', '.toggle', function(e) {
+    e.preventDefault();
     var $li   = $(this).parents('li:first');
     var $icon = $li.find('.icon.toggle');
     var $nested = $li.find('.nested');
@@ -10,7 +10,7 @@ $(function() {
       $nested.slideUp(); 
     }
     else {
-      var contentUrl = $nested.attr('data-ajax-content');
+      var contentUrl = $nested.data('ajax-content');
       $li.addClass('loading');
       
       $nested.load(contentUrl, function() {

data/app/assets/javascripts/refinery/wymeditor.js

@@ -27,11 +27,11 @@
    Global WYMeditor namespace.
 */
 /*
- *= require ../wymeditor/setup
- *= require ../wymeditor/functions
- *= require ../wymeditor/prototypes
- *= require ../wymeditor/classes
- *= require ../wymeditor/validators
+ *= require wymeditor/setup
+ *= require wymeditor/functions
+ *= require wymeditor/prototypes
+ *= require wymeditor/classes
+ *= require wymeditor/validators
  *= require_tree ../wymeditor/browsers
- *= require ./boot_wym
+ *= require refinery/boot_wym
 */

data/app/assets/javascripts/wymeditor/browsers/mozilla.js.erb

@@ -267,22 +267,21 @@ WYMeditor.WymClassMozilla.prototype.openBlockTag = function(tag, attributes)
 {
   var attributes = this.validator.getValidTagAttributes(tag, attributes);
 
-  // Handle Mozilla styled spans
-  if(tag == 'span' && attributes.style) {
-    var new_tag = this.getTagForStyle(attributes.style);
-    if(new_tag){
-      this._tag_stack.pop();
-      var tag = new_tag;
-      this._tag_stack.push(new_tag);
-      attributes.style = '';
-    } else {
-      return;
+    // Handle Mozilla styled spans
+    if (tag === 'span' && attributes.style) {
+        var new_tag = this.getTagForStyle(attributes.style);
+        if (new_tag) {
+            tag = new_tag;
+            this._tag_stack.pop();
+            this._tag_stack.push(tag);
+            attributes.style = '';
+        }
     }
-  }
 
   this.output += this.helper.tag(tag, attributes, true);
 };
 
+
 WYMeditor.WymClassMozilla.prototype.getTagForStyle = function(style) {
 
   if(/bold/.test(style)) return 'strong';

data/app/assets/javascripts/wymeditor/browsers/webkit.js.erb

@@ -251,27 +251,26 @@ WYMeditor.WymClassSafari.prototype.keyup = function(e) {
 
 WYMeditor.WymClassSafari.prototype.openBlockTag = function(tag, attributes)
 {
-  var attributes = this.validator.getValidTagAttributes(tag, attributes);
-
-  // Handle Safari styled spans
-  if(tag == 'span' && attributes.style) {
-    if(new_tag = this.getTagForStyle(attributes.style)) {
-      this._tag_stack.pop();
-      var tag = new_tag;
-      this._tag_stack.push(new_tag);
-      attributes.style = '';
-
-      //should fix #125 - also removed the xhtml() override
-      if(typeof attributes['class'] == 'string') {
-        attributes['class'] = attributes['class'].replace(/apple-style-span/gi, '');
-      }
+    var attributes = this.validator.getValidTagAttributes(tag, attributes);
+
+    // Handle Safari styled spans
+    if(tag == 'span' && attributes.style) {
+        new_tag = this.getTagForStyle(attributes.style);
+        if(new_tag) {
+            this._tag_stack.pop();
+            var tag = new_tag;
+            this._tag_stack.push(new_tag);
+            attributes.style = '';
+
+            //should fix #125 - also removed the xhtml() override
+            if(typeof attributes['class'] == 'string') {
+                attributes['class'] = attributes['class'].replace(/apple-style-span/gi, '');
+            }
 
-    } else {
-      return;
+        }
     }
-  }
 
-  this.output += this.helper.tag(tag, attributes, true);
+    this.output += this.helper.tag(tag, attributes, true);
 };
 
 WYMeditor.WymClassSafari.prototype.getTagForStyle = function(style) {

data/app/assets/javascripts/wymeditor/classes.js.erb

@@ -636,9 +636,7 @@ WYMeditor.Lexer.prototype._invokeParser = function(content, is_match)
   }
   var current = this._mode.getCurrent();
   var handler = this._mode_handlers[current];
-  var result;
-  eval('result = this._parser.' + handler + '(content, is_match);');
-  return result;
+  return this._parser[handler](content, is_match);
 };
 
 /**
@@ -1122,8 +1120,8 @@ WYMeditor.XhtmlSaxListener = function()
     "thead", "title", "tr", "tt", "ul", "var", "extends", "meter",
     "section", "article", "aside", "details", "header", "footer",
     "nav", "dialog", "figure", "figcaption", "address", "hgroup",
-    "mark", "time", "canvas", "audio", "video", "source", "output",
-    "progress", "ruby", "rt", "rp", "summary", "command"<%= ", #{Refinery::Core.wymeditor_whitelist_tags.keys.map{|k| %Q{"#{k}"}}.join(', ')}" if Refinery::Core.wymeditor_whitelist_tags.any? %>];
+    "mark", "time", "canvas", "audio", "video", "output",
+    "progress", "ruby", "rt", "rp", "summary", "command"];
 
 
     // Defines self-closing tags.

data/app/assets/javascripts/wymeditor/functions.js.erb

@@ -88,7 +88,11 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
   if(wym._selected_image) {
     imgDialog = $(wym._options.dialogImageSelector);
     img = $(wym._selected_image);
-    size = ((img.attr(WYMeditor.REL) || doc.find('#existing_image_size_area li.selected a').attr('rel')) || "");
+    size = (
+      (img.attr(WYMeditor.REL)
+        || doc.find('#existing_image_size_area li.selected a').attr(WYMeditor.REL)
+        || doc.find('#existing_image_size_area li.selected a').attr('rel')) || ""
+    );
     src = img.attr(WYMeditor.SRC);
     if (size.length > 0) {
       src = src.replace('_' + size + '.', '.');

data/app/assets/javascripts/wymeditor/prototypes.js.erb

@@ -796,9 +796,6 @@ WYMeditor.editor.prototype.dialog_ajax_callback = function(selected) {
   // now fix the height;
   $("#" + wym._options.dialogId + ".editor_dialog").css('height', 'auto');
 
-  // add corners to the buttons.
-  $('#' + wym._options.dialogId + " .button").corner('6px');
-
   // look for iframes
   (iframes = $("#" + this._options.dialogId).find('iframe')).load(function() {
     WYMeditor.INIT_DIALOG(wym, _selected, true);

data/app/assets/javascripts/wymeditor/setup.js.erb

@@ -102,7 +102,7 @@ $.extend(WYMeditor, {
     SKINS_DEFAULT_PATH    : "<%= asset_path 'wymeditor/skins/' %>",
     SKINS_DEFAULT_CSS      : "skin.css",
     SKINS_DEFAULT_JS      : "skin.js",
-    LANG_DEFAULT_PATH       : "lang/",
+    LANG_DEFAULT_PATH       : "<%= asset_path 'wymeditor/lang/' %>",
     IFRAME_BASE_PATH      : "{Wym_Iframe_Base_Path}",
     IFRAME_DEFAULT        : "iframe/default/",
     JQUERY_PATH             : "{Wym_Jquery_Path}",
@@ -154,7 +154,7 @@ $.extend(WYMeditor, {
     TITLE                   : "title",
     TARGET                : "target",
     ALT                    : "alt",
-    REL                     : 'rel',
+    REL                     : 'data-rel',
     DIALOG_LINK             : "Link",
     DIALOG_IMAGE          : "Image",
     DIALOG_TABLE          : "Table",
@@ -186,8 +186,8 @@ $.extend(WYMeditor, {
      "li", "tbody", "td", "tfoot", "th", "thead", "tr", "meter",
      "section", "article", "aside", "details", "header", "footer",
      "nav", "dialog", "figure", "figcaption", "address", "hgroup",
-     "mark", "time", "canvas", "audio", "video", "source", "output",
-     "progress", "ruby", "rt", "rp", "summary", "command"<%= ", #{Refinery::Core.wymeditor_whitelist_tags.keys.map{|k| %Q{"#{k}"}}.join(', ')}" if Refinery::Core.wymeditor_whitelist_tags.any? %>),
+     "mark", "time", "canvas", "audio", "video", "output",
+     "progress", "ruby", "rt", "rp", "summary", "command"),
 
     KEY : {
       BACKSPACE: 8,
@@ -323,7 +323,7 @@ $.fn.wymeditor = function(options) {
     initSkin:   true,
     loadSkin:   true,
 
-    lang:       "en",
+    lang:       refinery.current_admin_locale,
 
     direction:  "ltr",
 

data/app/assets/javascripts/wymeditor/skins/refinery/skin.js

@@ -25,7 +25,7 @@ WYMeditor.SKINS['refinery'] = {
 		},function(){
 			$(this).removeClass('hover');
 		});
-		
+
     // show or hide CSS class options on hover
     $(wym._box).find('.wym_tools_class')
                .hover($.proxy(function(){
@@ -38,9 +38,6 @@ WYMeditor.SKINS['refinery'] = {
     $(wym._box).css('width', $(wym._element).width() - 2)
       .find('.wym_iframe iframe').css('width', $(wym._box).width() - 2);
 
-		$('.button').corner('6px');
-		$(".wym_area_top li>a").corner("2px");
-
 		$(".wym_skin_refinery").animate({
 			opacity: 1
 		}, 800);