refinerycms-wymeditor 0.0.1 → 1.0.0

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

@@ -45,7 +45,7 @@ WYMeditor.editor.prototype.init = function() {
       for (var prop in WymClass) { this[prop] = WymClass[prop]; }
 
       //load wymbox
-      this._box = $(this._element).hide().after(this._options.boxHtml).next().addClass('wym_box_' + this._index);
+      this._box = $(this._element).hide().after(this._options.boxHtml).next().addClass('visual_editor_box_' + this._index);
 
       //store the instance index in wymbox and element replaced by editor instance
       //but keep it compatible with jQuery < 1.2.3, see #122
@@ -630,7 +630,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
   var wym = this;
 
   wym.update();
-  var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}/);
+  var path = this._wym._options.dialogPath + dialogType + '?wymeditor=true&' + window.location.href.match(/switch_locale=[a-z]{2}(?:-[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
@@ -691,7 +691,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
               end = selection.focusOffset;
             }
 
-            // for https://github.com/resolve/refinerycms/issues/581
+            // for https://github.com/refinery/refinerycms/issues/581
             if (typeof (start_node.insertData) === 'undefined') {
                 var j = start_node.childNodes.length - 1,
                     tmp_start_node = start_node;
@@ -780,7 +780,7 @@ WYMeditor.editor.prototype.dialog = function( dialogType ) {
       ajax_loaded_callback();
       break;
     default:
-      $("<img id='dialog_loading' src='/assets/refinery/dialogLoadingAnimation.gif' width='208' height='13' />").appendTo(dialog_container);
+      $("<img id='dialog_loading' src='<%= asset_path 'refinery/dialogLoadingAnimation.gif' %>' width='208' height='13' />").appendTo(dialog_container);
       dialog_container.dialog($.extend(wym._options.dialogFeatures, {
         title: dialog_title
       })).load(path, ajax_loaded_callback);
@@ -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);
@@ -995,7 +992,7 @@ WYMeditor.editor.prototype.computeBasePath = function() {
 };
 
 WYMeditor.editor.prototype.computeWymPath = function() {
-  return $('script[src*=jquery.refinery.wymeditor]').attr('src');
+  return $('script[src*=refinery\/wymeditor]').attr('src');
 };
 
 WYMeditor.editor.prototype.computeJqueryPath = function() {
@@ -1089,7 +1086,7 @@ WYMeditor.editor.prototype.loadSkin = function() {
     }
   }
 
-  //put the classname (ex. wym_skin_default) on wym_box
+  //put the classname (ex. wym_skin_default) on visual_editor_box
   $(this._box).addClass( "wym_skin_" + this._options.skin );
 
   //does the user want to use some JS to initialize the skin (default: yes)?

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

@@ -99,10 +99,10 @@ $.extend(WYMeditor, {
     BASE_PATH               : "{Wym_Base_Path}",
     CSS_PATH              : "{Wym_Css_Path}",
     WYM_PATH              : "{Wym_Wym_Path}",
-    SKINS_DEFAULT_PATH    : "/assets/wymeditor/skins/",
+    SKINS_DEFAULT_PATH    : "<%= Rails.application.config.assets.prefix + '/wymeditor/skins/wymeditor_icon.png' %>",
     SKINS_DEFAULT_CSS      : "skin.css",
     SKINS_DEFAULT_JS      : "skin.js",
-    LANG_DEFAULT_PATH       : "lang/",
+    LANG_DEFAULT_PATH       : "<%= Rails.application.config.assets.prefix + '/wymeditor/lang/en.js' %>",
     IFRAME_BASE_PATH      : "{Wym_Iframe_Base_Path}",
     IFRAME_DEFAULT        : "iframe/default/",
     JQUERY_PATH             : "{Wym_Jquery_Path}",
@@ -125,8 +125,8 @@ $.extend(WYMeditor, {
     HTML                  : "{Wym_Html}",
     IFRAME                : "{Wym_Iframe}",
     STATUS                : "{Wym_Status}",
-    DIALOG_TITLE          : "{Wym_Dialog_Title}",
-    DIALOG_BODY             : "{Wym_Dialog_Body}",
+    DIALOG_TITLE          : "{Visual_Editor_Dialog_Title}",
+    DIALOG_BODY             : "{Visual_Editor_Dialog_Body}",
     STRING                : "string",
     BODY                  : "body",
     DIV                     : "div",
@@ -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::Wymeditor.whitelist_tags.keys.map{|k| %Q{"#{k}"}}.join(', ')}" if Refinery::Wymeditor.whitelist_tags.any? %>),
+     "mark", "time", "canvas", "audio", "video", "output",
+     "progress", "ruby", "rt", "rp", "summary", "command"),
 
     KEY : {
       BACKSPACE: 8,
@@ -323,11 +323,11 @@ $.fn.wymeditor = function(options) {
     initSkin:   true,
     loadSkin:   true,
 
-    lang:       "en",
+    lang:       refinery.current_admin_locale,
 
     direction:  "ltr",
 
-    boxHtml: "<div class='wym_box'>"
+    boxHtml: "<div class='visual_editor_box'>"
               + "<div class='wym_area_top'>" + WYMeditor.TOOLS + "</div>"
               + "<div class='wym_area_left'></div>"
               + "<div class='wym_area_right'>" + WYMeditor.CONTAINERS + WYMeditor.CLASSES + "</div>"
@@ -424,7 +424,7 @@ $.fn.wymeditor = function(options) {
                         + "<textarea class='wym_html_val'></textarea>"
                       +"</div>",
 
-    boxSelector:       ".wym_box",
+    boxSelector:       ".visual_editor_box",
     toolsSelector:     ".wym_tools",
     toolsListSelector: " ul",
     containersSelector:".wym_containers",
@@ -440,13 +440,13 @@ $.fn.wymeditor = function(options) {
     classHiddenSelector: ".wym_classes_hidden",
     htmlValSelector:   ".wym_html_val",
 
-    hrefSelector:      ".wym_href",
-    srcSelector:       ".wym_src",
-    titleSelector:     ".wym_title",
-    targetSelector:    ".wym_target",
-    altSelector:       ".wym_alt",
+    hrefSelector:      ".visual_editor_href",
+    srcSelector:       ".visual_editor_src",
+    titleSelector:     ".visual_editor_title",
+    targetSelector:    ".visual_editor_target",
+    altSelector:       ".visual_editor_alt",
     textSelector:      ".wym_text",
-    sizeSelector:      ".wym_size",
+    sizeSelector:      ".visual_editor_size",
 
     rowsSelector:      ".wym_rows",
     colsSelector:      ".wym_cols",
@@ -457,12 +457,12 @@ $.fn.wymeditor = function(options) {
     cancelSelector:    ".wym_cancel",
     previewSelector:   "",
 
-    dialogTypeSelector:    ".wym_dialog_type",
-    dialogLinkSelector:    ".wym_dialog_link",
-    dialogImageSelector:   ".wym_dialog_image",
-    dialogTableSelector:   ".wym_dialog_table",
-    dialogPasteSelector:   ".wym_dialog_paste",
-    dialogPreviewSelector: ".wym_dialog_preview",
+    dialogTypeSelector:    ".visual_editor_dialog_type",
+    dialogLinkSelector:    ".visual_editor_dialog_link",
+    dialogImageSelector:   ".visual_editor_dialog_image",
+    dialogTableSelector:   ".visual_editor_dialog_table",
+    dialogPasteSelector:   ".visual_editor_dialog_paste",
+    dialogPreviewSelector: ".visual_editor_dialog_preview",
 
     updateSelector:    ".wymupdate",
     updateEvent:       "click",
@@ -486,20 +486,20 @@ $.fn.wymeditor = function(options) {
                     + WYMeditor.DIALOG_BODY
                   + "</html>",
 
-    dialogLinkHtml:  "<div class='wym_dialog wym_dialog_link'>"
+    dialogLinkHtml:  "<div class='visual_editor_dialog visual_editor_dialog_link'>"
                + "<form>"
                + "<fieldset>"
-               + "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='"
+               + "<input type='hidden' id='visual_editor_dialog_type' class='visual_editor_dialog_type' value='"
                + WYMeditor.DIALOG_LINK
                + "' />"
                + "<legend>{Link}</legend>"
                + "<div class='row'>"
                + "<label>{URL}</label>"
-               + "<input type='text' class='wym_href' value='' size='40' />"
+               + "<input type='text' class='visual_editor_href' value='' size='40' />"
                + "</div>"
                + "<div class='row'>"
                + "<label>{Title}</label>"
-               + "<input type='text' class='wym_title' value='' size='40' />"
+               + "<input type='text' class='visual_editor_title' value='' size='40' />"
                + "</div>"
                + "<div class='row row-indent'>"
                + "<input class='wym_submit button' type='button'"
@@ -511,24 +511,24 @@ $.fn.wymeditor = function(options) {
                + "</form>"
                + "</div>",
 
-    dialogImageHtml:  "<div class='wym_dialog wym_dialog_image'>"
+    dialogImageHtml:  "<div class='visual_editor_dialog visual_editor_dialog_image'>"
                + "<form>"
                + "<fieldset>"
-               + "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='"
+               + "<input type='hidden' id='visual_editor_dialog_type' class='visual_editor_dialog_type' value='"
                + WYMeditor.DIALOG_IMAGE
                + "' />"
                + "<legend>{Image}</legend>"
                + "<div class='row'>"
                + "<label>{URL}</label>"
-               + "<input type='text' class='wym_src' value='' size='40' />"
+               + "<input type='text' class='visual_editor_src' value='' size='40' />"
                + "</div>"
                + "<div class='row'>"
                + "<label>{Alternative_Text}</label>"
-               + "<input type='text' class='wym_alt' value='' size='40' />"
+               + "<input type='text' class='visual_editor_alt' value='' size='40' />"
                + "</div>"
                + "<div class='row'>"
                + "<label>{Title}</label>"
-               + "<input type='text' class='wym_title' value='' size='40' />"
+               + "<input type='text' class='visual_editor_title' value='' size='40' />"
                + "</div>"
                + "<div class='row row-indent'>"
                + "<input class='wym_submit button' type='button'"
@@ -540,9 +540,9 @@ $.fn.wymeditor = function(options) {
                + "</form>"
                + "</div>",
 
-    dialogTableHtml:  "<div class='wym_dialog wym_dialog_table'>"
+    dialogTableHtml:  "<div class='visual_editor_dialog visual_editor_dialog_table'>"
                + "<form>"
-               + "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='"
+               + "<input type='hidden' id='visual_editor_dialog_type' class='visual_editor_dialog_type' value='"
                + WYMeditor.DIALOG_TABLE
                + "' />"
                + "<div class='row'>"
@@ -570,9 +570,9 @@ $.fn.wymeditor = function(options) {
                + "</form>"
                + "</div>",
 
-    dialogPasteHtml:  "<div class='wym_dialog wym_dialog_paste'>"
+    dialogPasteHtml:  "<div class='visual_editor_dialog visual_editor_dialog_paste'>"
                + "<form>"
-               + "<input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='"
+               + "<input type='hidden' id='visual_editor_dialog_type' class='visual_editor_dialog_type' value='"
                + WYMeditor.DIALOG_PASTE
                + "' />"
                + "<fieldset>"
@@ -590,7 +590,7 @@ $.fn.wymeditor = function(options) {
                + "</form>"
                + "</div>",
 
-    dialogPreviewHtml: "<div class='wym_dialog wym_dialog_preview'></div>",
+    dialogPreviewHtml: "<div class='visual_editor_dialog visual_editor_dialog_preview'></div>",
 
     dialogStyles: [],
 

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);

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

@@ -338,8 +338,9 @@ 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|placeholder)$/,
-        "4":"value"
+        "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)$/,
+        "4":"value",
+        "5":"placeholder"
       },
       "inside":"form"
     },

data/app/assets/stylesheets/wymeditor/skins/refinery/skin.css.scss

@@ -41,7 +41,7 @@
   padding: 5px 5px 0px 5px
 }
 
-/*auto-clear the wym_box*/
+/*auto-clear the visual_editor_box*/
 .wym_skin_refinery:after {
   content: ".";
   display: block;
@@ -394,38 +394,38 @@ background-image: image_url('wymeditor/skins/refinery/style.png');
 }
 
 /*DIALOGS*/
-.wym_dialog div.row {
+.visual_editor_dialog div.row {
   margin-bottom: 5px;
 }
-.wym_dialog div.row input {
+.visual_editor_dialog div.row input {
   margin-right: 5px;
 }
-.wym_dialog div.row label {
+.visual_editor_dialog div.row label {
   float: left;
   width: 150px;
   display: block;
   text-align: right;
   margin-right: 10px;
 }
-.wym_dialog div.row-indent {
+.visual_editor_dialog div.row-indent {
   padding-left: 160px;
 }
 /*autoclearing*/
-.wym_dialog div.row:after {
+.visual_editor_dialog div.row:after {
   content: ".";
   display: block;
   height: 0;
   clear: both;
   visibility: hidden;
 }
-.wym_dialog div.row {
+.visual_editor_dialog div.row {
   display: inline-block;
 }
 /* Hides from IE-mac \*/
-* html .wym_dialog div.row {
+* html .visual_editor_dialog div.row {
   height: 1%;
 }
-.wym_dialog div.row {
+.visual_editor_dialog div.row {
   display: block;
 }
 /* End hide from IE-mac */

data/app/assets/stylesheets/wymeditor/skins/refinery/wymiframe.css.scss

@@ -74,34 +74,34 @@
   td      { height: 1.6em; }
 
 /* labels */
-  p           { background-image: asset_url('wymeditor/skins/refinery/html5/p.png', image); }
-  h1          { background-image: asset_url('wymeditor/skins/refinery/html5/h1.png', image); }
-  h2          { background-image: asset_url('wymeditor/skins/refinery/html5/h2.png', image); }
-  h3          { background-image: asset_url('wymeditor/skins/refinery/html5/h3.png', image); }
-  h4          { background-image: asset_url('wymeditor/skins/refinery/html5/h4.png', image); }
-  h5          { background-image: asset_url('wymeditor/skins/refinery/html5/h5.png', image); }
-  h6          { background-image: asset_url('wymeditor/skins/refinery/html5/h6.png', image); }
-  blockquote  { background-image: asset_url('wymeditor/skins/refinery/html5/blockquote.png', image); }
-  pre         { background-image: asset_url('wymeditor/skins/refinery/html5/pre.png', image); }
-  meter       { background-image: asset_url('wymeditor/skins/refinery/html5/meter.png', image); }
-  nav         { background-image: asset_url('wymeditor/skins/refinery/html5/nav.png', image); }
-  ruby        { background-image: asset_url('wymeditor/skins/refinery/html5/ruby.png', image); }
-  rt          { background-image: asset_url('wymeditor/skins/refinery/html5/rt.png', image); }
-  rp          { background-image: asset_url('wymeditor/skins/refinery/html5/rp.png', image); }
-  article     { background-image: asset_url('wymeditor/skins/refinery/html5/article.png', image); }
-  aside       { background-image: asset_url('wymeditor/skins/refinery/html5/aside.png', image); }
-  command     { background-image: asset_url('wymeditor/skins/refinery/html5/command.png', image); }
-  details     { background-image: asset_url('wymeditor/skins/refinery/html5/details.png', image); }  
-  summary     { background-image: asset_url('wymeditor/skins/refinery/html5/summary.png', image); }
-  figure      { background-image: asset_url('wymeditor/skins/refinery/html5/figure.png', image); }
-  figcaption  { background-image: asset_url('wymeditor/skins/refinery/html5/figcaption.png', image); }
-  footer      { background-image: asset_url('wymeditor/skins/refinery/html5/footer.png', image); }
-  header      { background-image: asset_url('wymeditor/skins/refinery/html5/header.png', image); }
-  hgroup      { background-image: asset_url('wymeditor/skins/refinery/html5/hgroup.png', image); }
-  mark        { background-image: asset_url('wymeditor/skins/refinery/html5/mark.png', image); }
-  progress    { background-image: asset_url('wymeditor/skins/refinery/html5/progress.png', image); }
-  section     { background-image: asset_url('wymeditor/skins/refinery/html5/section.png', image); }
-  time        { background-image: asset_url('wymeditor/skins/refinery/html5/time.png', image); }
+  p           { background-image: asset-url('wymeditor/skins/refinery/html5/p.png'); }
+  h1          { background-image: asset-url('wymeditor/skins/refinery/html5/h1.png'); }
+  h2          { background-image: asset-url('wymeditor/skins/refinery/html5/h2.png'); }
+  h3          { background-image: asset-url('wymeditor/skins/refinery/html5/h3.png'); }
+  h4          { background-image: asset-url('wymeditor/skins/refinery/html5/h4.png'); }
+  h5          { background-image: asset-url('wymeditor/skins/refinery/html5/h5.png'); }
+  h6          { background-image: asset-url('wymeditor/skins/refinery/html5/h6.png'); }
+  blockquote  { background-image: asset-url('wymeditor/skins/refinery/html5/blockquote.png'); }
+  pre         { background-image: asset-url('wymeditor/skins/refinery/html5/pre.png'); }
+  meter       { background-image: asset-url('wymeditor/skins/refinery/html5/meter.png'); }
+  nav         { background-image: asset-url('wymeditor/skins/refinery/html5/nav.png'); }
+  ruby        { background-image: asset-url('wymeditor/skins/refinery/html5/ruby.png'); }
+  rt          { background-image: asset-url('wymeditor/skins/refinery/html5/rt.png'); }
+  rp          { background-image: asset-url('wymeditor/skins/refinery/html5/rp.png'); }
+  article     { background-image: asset-url('wymeditor/skins/refinery/html5/article.png'); }
+  aside       { background-image: asset-url('wymeditor/skins/refinery/html5/aside.png'); }
+  command     { background-image: asset-url('wymeditor/skins/refinery/html5/command.png'); }
+  details     { background-image: asset-url('wymeditor/skins/refinery/html5/details.png'); }
+  summary     { background-image: asset-url('wymeditor/skins/refinery/html5/summary.png'); }
+  figure      { background-image: asset-url('wymeditor/skins/refinery/html5/figure.png'); }
+  figcaption  { background-image: asset-url('wymeditor/skins/refinery/html5/figcaption.png'); }
+  footer      { background-image: asset-url('wymeditor/skins/refinery/html5/footer.png'); }
+  header      { background-image: asset-url('wymeditor/skins/refinery/html5/header.png'); }
+  hgroup      { background-image: asset-url('wymeditor/skins/refinery/html5/hgroup.png'); }
+  mark        { background-image: asset-url('wymeditor/skins/refinery/html5/mark.png'); }
+  progress    { background-image: asset-url('wymeditor/skins/refinery/html5/progress.png'); }
+  section     { background-image: asset-url('wymeditor/skins/refinery/html5/section.png'); }
+  time        { background-image: asset-url('wymeditor/skins/refinery/html5/time.png'); }
 
 /* specific HTML elements */
 	caption	 { text-align: left; }
@@ -132,7 +132,7 @@
   img.selected_by_wym {
     border: 1px dashed #22a7f2;
   }
-  
+
   article,
   aside,
   command,

data/app/decorators/controllers/refinery/fast_controller_decorator.rb

@@ -0,0 +1,5 @@
+Refinery::FastController.class_eval do
+  def wymiframe
+    render :template => "/refinery/wymiframe", :layout => false
+  end
+end

data/app/decorators/models/refinery/page/friendly_id_options_decorator.rb

@@ -0,0 +1,8 @@
+Refinery::Page::FriendlyIdOptions.class_eval do
+  class << self
+    def reserved_words_with_wymiframe
+      reserved_words_without_wymiframe.push('wymiframe')
+    end
+    alias_method_chain :reserved_words, :wymiframe
+  end
+end

data/app/views/refinery/admin/dialogs/show.html.erb

@@ -0,0 +1,19 @@
+<form id='visual_editor_dialog_form' class='visual_editor_dialog visual_editor_dialog_<%= @dialog_type %>'>
+  <input type='hidden' id='visual_editor_dialog_type' class='visual_editor_dialog_type' value='<%= @dialog_type %>' />
+  <iframe src='<%= @iframe_src %>' id='dialog_frame' frameborder='0' marginheight='0' marginwidth='0' border='0'></iframe>
+  <div class='wym_hideables'>
+  <% if @dialog_type == "image" %>
+    <input type='hidden' id='visual_editor_src' class='visual_editor_src' value='' />
+    <input type='hidden' id='visual_editor_alt' class='visual_editor_alt' value='' />
+    <input type='hidden' id='visual_editor_title' class='visual_editor_title' value='' />
+    <input type='hidden' id='visual_editor_size' class='visual_editor_size' value='' />
+  <% elsif @dialog_type == "link" %>
+    <input type='hidden' id='visual_editor_href' class='visual_editor_href' value='' />
+    <input type='hidden' id='visual_editor_title' class='visual_editor_title' value='' />
+    <input type='hidden' id='visual_editor_target' class='visual_editor_target' value='' />
+  <% end %>
+
+    <input id='visual_editor_dialog_submit' class='wym_submit submit_dialog button' type='button' value='<%= t('.save') %>' />
+    <a id='visual_editor_dialog_cancel' href='' class='wym_cancel close_dialog button'><%= t('.cancel') %></a>
+  </div>
+</form>