spree_editor 0.50.0 → 0.50.1

data/public/javascripts/tinymce/utils/form_utils.js

@@ -11,10 +11,14 @@
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
 
 function getColorPickerHTML(id, target_form_element) {
-	var h = "";
+	var h = "", dom = tinyMCEPopup.dom;
 
-	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
+	if (label = dom.select('label[for=' + target_form_element + ']')[0]) {
+		label.id = label.id || dom.uniqueId();
+	}
+
+	h += '<a role="button" aria-labelledby="' + id + '_label" id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;<span id="' + id + '_label" class="mceVoiceLabel mceIconOnly" style="display:none;">' + tinyMCEPopup.getLang('browse') + '</span></span></a>';
 
 	return h;
 }
@@ -67,6 +71,9 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 	if (!form_obj || !form_obj.elements[field_name])
 		return;
 
+	if (!value)
+		value = "";
+
 	var sel = form_obj.elements[field_name];
 
 	var found = false;
@@ -171,7 +178,7 @@ function convertHexToRGB(col) {
 }
 
 function trimSize(size) {
-	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
+	return size.replace(/([0-9\.]+)(px|%|in|cm|mm|em|ex|pt|pc)/i, '$1$2');
 }
 
 function getCSSSize(size) {
@@ -183,6 +190,9 @@ function getCSSSize(size) {
 	// Add px
 	if (/^[0-9]+$/.test(size))
 		size += 'px';
+	// Sanity check, IE doesn't like broken values
+	else if (!(/^[0-9\.]+(px|%|in|cm|mm|em|ex|pt|pc)$/i.test(size)))
+		return "";
 
 	return size;
 }

data/public/javascripts/tinymce/utils/mctabs.js

@@ -10,6 +10,7 @@
 
 function MCTabs() {
 	this.settings = [];
+	this.onChange = tinyMCEPopup.editor.windowManager.createInstance('tinymce.util.Dispatcher');
 };
 
 MCTabs.prototype.init = function(settings) {
@@ -28,26 +29,62 @@ MCTabs.prototype.getParam = function(name, default_value) {
 	return value;
 };
 
-MCTabs.prototype.displayTab = function(tab_id, panel_id) {
-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
+MCTabs.prototype.showTab =function(tab){
+	tab.className = 'current';
+	tab.setAttribute("aria-selected", true);
+	tab.setAttribute("aria-expanded", true);
+	tab.tabIndex = 0;
+};
+
+MCTabs.prototype.hideTab =function(tab){
+	var t=this;
+
+	tab.className = '';
+	tab.setAttribute("aria-selected", false);
+	tab.setAttribute("aria-expanded", false);
+	tab.tabIndex = -1;
+};
+
+MCTabs.prototype.showPanel = function(panel) {
+	panel.className = 'current'; 
+	panel.setAttribute("aria-hidden", false);
+};
+
+MCTabs.prototype.hidePanel = function(panel) {
+	panel.className = 'panel';
+	panel.setAttribute("aria-hidden", true);
+}; 
+
+MCTabs.prototype.getPanelForTab = function(tabElm) {
+	return tinyMCEPopup.dom.getAttrib(tabElm, "aria-controls");
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id, avoid_focus) {
+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i, t = this;
+
+	tabElm = document.getElementById(tab_id);
+
+	if (panel_id === undefined) {
+		panel_id = t.getPanelForTab(tabElm);
+	}
 
 	panelElm= document.getElementById(panel_id);
 	panelContainerElm = panelElm ? panelElm.parentNode : null;
-	tabElm = document.getElementById(tab_id);
 	tabContainerElm = tabElm ? tabElm.parentNode : null;
-	selectionClass = this.getParam('selection_class', 'current');
+	selectionClass = t.getParam('selection_class', 'current');
 
 	if (tabElm && tabContainerElm) {
 		nodes = tabContainerElm.childNodes;
 
 		// Hide all other tabs
 		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "LI")
-				nodes[i].className = '';
+			if (nodes[i].nodeName == "LI") {
+				t.hideTab(nodes[i]);
+			}
 		}
 
 		// Show selected tab
-		tabElm.className = 'current';
+		t.showTab(tabElm);
 	}
 
 	if (panelElm && panelContainerElm) {
@@ -56,11 +93,15 @@ MCTabs.prototype.displayTab = function(tab_id, panel_id) {
 		// Hide all other panels
 		for (i = 0; i < nodes.length; i++) {
 			if (nodes[i].nodeName == "DIV")
-				nodes[i].className = 'panel';
+				t.hidePanel(nodes[i]);
+		}
+
+		if (!avoid_focus) { 
+			tabElm.focus();
 		}
 
 		// Show selected panel
-		panelElm.className = 'current';
+		t.showPanel(panelElm);
 	}
 };
 
@@ -73,5 +114,49 @@ MCTabs.prototype.getAnchor = function() {
 	return "";
 };
 
-// Global instance
+
+//Global instance
 var mcTabs = new MCTabs();
+
+tinyMCEPopup.onInit.add(function() {
+	var tinymce = tinyMCEPopup.getWin().tinymce, dom = tinyMCEPopup.dom, each = tinymce.each;
+
+	each(dom.select('div.tabs'), function(tabContainerElm) {
+		var keyNav;
+
+		dom.setAttrib(tabContainerElm, "role", "tablist"); 
+
+		var items = tinyMCEPopup.dom.select('li', tabContainerElm);
+		var action = function(id) {
+			mcTabs.displayTab(id, mcTabs.getPanelForTab(id));
+			mcTabs.onChange.dispatch(id);
+		};
+
+		each(items, function(item) {
+			dom.setAttrib(item, 'role', 'tab');
+			dom.bind(item, 'click', function(evt) {
+				action(item.id);
+			});
+		});
+
+		dom.bind(dom.getRoot(), 'keydown', function(evt) {
+			if (evt.keyCode === 9 && evt.ctrlKey && !evt.altKey) { // Tab
+				keyNav.moveFocus(evt.shiftKey ? -1 : 1);
+				tinymce.dom.Event.cancel(evt);
+			}
+		});
+
+		each(dom.select('a', tabContainerElm), function(a) {
+			dom.setAttrib(a, 'tabindex', '-1');
+		});
+
+		keyNav = tinyMCEPopup.editor.windowManager.createInstance('tinymce.ui.KeyboardNavigation', {
+			root: tabContainerElm,
+			items: items,
+			onAction: action,
+			actOnFocus: true,
+			enableLeftRight: true,
+			enableUpDown: true
+		}, tinyMCEPopup.dom);
+	});
+});

data/public/javascripts/tinymce/utils/validate.js

@@ -32,7 +32,7 @@ var Validator = {
 	},
 
 	isSize : function(s) {
-		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+		return this.test(s, '^[0-9.]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
 	},
 
 	isId : function(s) {
@@ -96,8 +96,10 @@ var AutoValidator = {
 		var i, nl, s = this.settings, c = 0;
 
 		nl = this.tags(f, 'label');
-		for (i=0; i<nl.length; i++)
+		for (i=0; i<nl.length; i++) {
 			this.removeClass(nl[i], s.invalid_cls);
+			nl[i].setAttribute('aria-invalid', false);
+		}
 
 		c += this.validateElms(f, 'input');
 		c += this.validateElms(f, 'select');
@@ -109,6 +111,33 @@ var AutoValidator = {
 	invalidate : function(n) {
 		this.mark(n.form, n);
 	},
+	
+	getErrorMessages : function(f) {
+		var nl, i, s = this.settings, field, msg, values, messages = [], ed = tinyMCEPopup.editor;
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (this.hasClass(nl[i], s.invalid_cls)) {
+				field = document.getElementById(nl[i].getAttribute("for"));
+				values = { field: nl[i].textContent };
+				if (this.hasClass(field, s.min_cls, true)) {
+					message = ed.getLang('invalid_data_min');
+					values.min = this.getNum(field, s.min_cls);
+				} else if (this.hasClass(field, s.number_cls)) {
+					message = ed.getLang('invalid_data_number');
+				} else if (this.hasClass(field, s.size_cls)) {
+					message = ed.getLang('invalid_data_size');
+				} else {
+					message = ed.getLang('invalid_data');
+				}
+				
+				message = message.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return values[b] || '{#' + b + '}';
+				});
+				messages.push(message);
+			}
+		}
+		return messages;
+	},
 
 	reset : function(e) {
 		var t = ['label', 'input', 'select', 'textarea'];
@@ -119,8 +148,10 @@ var AutoValidator = {
 
 		for (i=0; i<t.length; i++) {
 			nl = this.tags(e.form ? e.form : e, t[i]);
-			for (j=0; j<nl.length; j++)
+			for (j=0; j<nl.length; j++) {
 				this.removeClass(nl[j], s.invalid_cls);
+				nl[j].setAttribute('aria-invalid', false);
+			}
 		}
 	},
 
@@ -201,6 +232,7 @@ var AutoValidator = {
 		var s = this.settings;
 
 		this.addClass(n, s.invalid_cls);
+		n.setAttribute('aria-invalid', 'true');
 		this.markLabels(f, n, s.invalid_cls);
 
 		return false;

data/public/stylesheets/editor.css

@@ -42,4 +42,27 @@
 
 .yui-toolbar-group-undoredo h3, .yui-toolbar-group-insertitem h3, .yui-toolbar-group-indentlist h3 {
     width: auto;
+}
+
+.yui-skin-sam .yui-toolbar-container .yui-toolbar-editcode span.yui-toolbar-icon {
+    background-image: url("/images/html_editor.gif");
+    background-position: 0 1px;
+    left: 5px;
+}
+.yui-skin-sam .yui-toolbar-container .yui-button-editcode-selected span.yui-toolbar-icon {
+    background-image: url("/images/html_editor.gif");
+    background-position: 0 1px;
+    left: 5px;
+}
+
+.editor-hidden {
+    visibility: hidden;
+    top: -9999px;
+    left: -9999px;
+    position: absolute !important;
+}
+textarea {
+    border: 0;
+    margin: 0;
+    padding: 0;
 }

data/spree_editor.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_editor'
-  s.version     = '0.50.0'
+  s.version     = '0.50.1'
   s.summary     = 'Adds support of several WYSIWYG editors to Spree'
   s.description = 'Atm supported: YUIRichEditor, WYMEditor, TinyMCE'
   s.required_ruby_version = '>= 1.8.7'
 
   s.authors           = ['Alexander Shuhin', 'Roman Smirnov', 'divineforest']
   # s.email             = 'david@loudthinking.com'
-  s.homepage          = 'http://github.com/romul/spree_editor'
+  s.homepage          = 'http://github.com/spree/spree_editor'
   # s.rubyforge_project = 'actionmailer'
 
   s.files         = `git ls-files`.split("\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 50
-  - 0
-  version: 0.50.0
+  - 1
+  version: 0.50.1
 platform: ruby
 authors: 
 - Alexander Shuhin
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +04:00
+date: 2011-06-25 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,6 +46,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Versionfile
 - app/controllers/admin/editor_settings_controller.rb
 - app/controllers/content_files_controller.rb
 - app/controllers/content_images_controller.rb
@@ -58,6 +59,7 @@ files:
 - app/views/shared/editor_engines/_wym_editor.html.erb
 - app/views/shared/editor_engines/_yui_rich_editor.html.erb
 - config/locales/en.yml
+- config/locales/es.yml
 - config/locales/ru.yml
 - config/routes.rb
 - lib/editor_configuration.rb
@@ -66,6 +68,7 @@ files:
 - lib/spree_editor_hooks.rb
 - lib/tasks/install.rake
 - lib/tasks/spree_editor.rake
+- public/images/html_editor.gif
 - public/images/upload_file.png
 - public/images/upload_image.png
 - public/javascripts/jquery.ocupload.js
@@ -97,6 +100,8 @@ files:
 - public/javascripts/tinymce/plugins/advlink/link.htm
 - public/javascripts/tinymce/plugins/advlist/editor_plugin.js
 - public/javascripts/tinymce/plugins/advlist/editor_plugin_src.js
+- public/javascripts/tinymce/plugins/autolink/editor_plugin.js
+- public/javascripts/tinymce/plugins/autolink/editor_plugin_src.js
 - public/javascripts/tinymce/plugins/autoresize/editor_plugin.js
 - public/javascripts/tinymce/plugins/autoresize/editor_plugin_src.js
 - public/javascripts/tinymce/plugins/autosave/editor_plugin.js
@@ -166,6 +171,8 @@ files:
 - public/javascripts/tinymce/plugins/layer/editor_plugin_src.js
 - public/javascripts/tinymce/plugins/legacyoutput/editor_plugin.js
 - public/javascripts/tinymce/plugins/legacyoutput/editor_plugin_src.js
+- public/javascripts/tinymce/plugins/lists/editor_plugin.js
+- public/javascripts/tinymce/plugins/lists/editor_plugin_src.js
 - public/javascripts/tinymce/plugins/media/css/content.css
 - public/javascripts/tinymce/plugins/media/css/media.css
 - public/javascripts/tinymce/plugins/media/editor_plugin.js
@@ -182,6 +189,7 @@ files:
 - public/javascripts/tinymce/plugins/media/langs/en_dlg.js
 - public/javascripts/tinymce/plugins/media/langs/ru_dlg.js
 - public/javascripts/tinymce/plugins/media/media.htm
+- public/javascripts/tinymce/plugins/media/moxieplayer.swf
 - public/javascripts/tinymce/plugins/nonbreaking/editor_plugin.js
 - public/javascripts/tinymce/plugins/nonbreaking/editor_plugin_src.js
 - public/javascripts/tinymce/plugins/noneditable/editor_plugin.js
@@ -282,7 +290,16 @@ files:
 - public/javascripts/tinymce/themes/advanced/editor_template_src.js
 - public/javascripts/tinymce/themes/advanced/image.htm
 - public/javascripts/tinymce/themes/advanced/img/colorpicker.jpg
+- public/javascripts/tinymce/themes/advanced/img/flash.gif
 - public/javascripts/tinymce/themes/advanced/img/icons.gif
+- public/javascripts/tinymce/themes/advanced/img/iframe.gif
+- public/javascripts/tinymce/themes/advanced/img/pagebreak.gif
+- public/javascripts/tinymce/themes/advanced/img/quicktime.gif
+- public/javascripts/tinymce/themes/advanced/img/realmedia.gif
+- public/javascripts/tinymce/themes/advanced/img/shockwave.gif
+- public/javascripts/tinymce/themes/advanced/img/trans.gif
+- public/javascripts/tinymce/themes/advanced/img/video.gif
+- public/javascripts/tinymce/themes/advanced/img/windowsmedia.gif
 - public/javascripts/tinymce/themes/advanced/js/about.js
 - public/javascripts/tinymce/themes/advanced/js/anchor.js
 - public/javascripts/tinymce/themes/advanced/js/charmap.js
@@ -295,6 +312,7 @@ files:
 - public/javascripts/tinymce/themes/advanced/langs/ru.js
 - public/javascripts/tinymce/themes/advanced/langs/ru_dlg.js
 - public/javascripts/tinymce/themes/advanced/link.htm
+- public/javascripts/tinymce/themes/advanced/shortcuts.htm
 - public/javascripts/tinymce/themes/advanced/skins/default/content.css
 - public/javascripts/tinymce/themes/advanced/skins/default/dialog.css
 - public/javascripts/tinymce/themes/advanced/skins/default/img/buttons.png
@@ -304,6 +322,9 @@ files:
 - public/javascripts/tinymce/themes/advanced/skins/default/img/progress.gif
 - public/javascripts/tinymce/themes/advanced/skins/default/img/tabs.gif
 - public/javascripts/tinymce/themes/advanced/skins/default/ui.css
+- public/javascripts/tinymce/themes/advanced/skins/highcontrast/content.css
+- public/javascripts/tinymce/themes/advanced/skins/highcontrast/dialog.css
+- public/javascripts/tinymce/themes/advanced/skins/highcontrast/ui.css
 - public/javascripts/tinymce/themes/advanced/skins/o2k7/content.css
 - public/javascripts/tinymce/themes/advanced/skins/o2k7/dialog.css
 - public/javascripts/tinymce/themes/advanced/skins/o2k7/img/button_bg.png
@@ -389,7 +410,7 @@ files:
 - spec/spec_helper.rb
 - spree_editor.gemspec
 has_rdoc: true
-homepage: http://github.com/romul/spree_editor
+homepage: http://github.com/spree/spree_editor
 licenses: []
 
 post_install_message: