sg101: media/js/tiny_mce/themes/advanced/editor_template_src.js comparison

comparison media/js/tiny_mce/themes/advanced/editor_template_src.js @ 217:237710206167

Update TinyMCE to 3.3.6

author	Brian Neal <bgneal@gmail.com>
date	Tue, 01 Jun 2010 04:49:29 +0000
parents	149c3567fec1
children	6ed2932901fa

comparison

equal deleted inserted replaced

-:fe900598f81c
+:237710206167
 				each(ed.dom.getClasses(), function(o, idx) {
 					var name = 'style_' + idx;
 					ed.formatter.register(name, {
 						inline : 'span',
-						classes : o['class'],
+						attributes : {'class' : o['class']},
 						selector : '*'
 					});
 					ctrl.add(o['class'], name);
 				});
 			// Setup style select box
 			ctrl = ctrlMan.createListBox('styleselect', {
 				title : 'advanced.style_select',
 				onselect : function(name) {
-					ed.execCommand('mceToggleFormat', false, name);
+					var matches, formatNames = [];
+					each(ctrl.items, function(item) {
+						formatNames.push(item.value);
+					});
+					ed.focus();
+					// Toggle off the current format
+					matches = ed.formatter.matchAll(formatNames);
+					if (matches[0] == name)
+						ed.formatter.remove(name);
+					else
+						ed.formatter.apply(name);
 					return false; // No auto select
 				}
 			});
 						if (val) {
 							name = 'style_' + (counter++);
 							ed.formatter.register(name, {
 								inline : 'span',
-								classes : val
+								classes : val,
+								selector : '*'
 							});
 							ctrl.add(t.editor.translate(key), name);
 						}
 					});
 		_createFontSizeSelect : function() {
 			var t = this, ed = t.editor, c, i = 0, cl = [];
 			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) {
-				if (v.fontSize)
+				if (v['class']) {
+					ed.focus();
+					ed.formatter.toggle('fontsize_class', {value : v['class']});
+				} else
 					ed.execCommand('FontSize', false, v.fontSize);
-				else {
-					each(t.settings.theme_advanced_font_sizes, function(v, k) {
-						if (v['class'])
-							cl.push(v['class']);
-					});
-					ed.editorCommands._applyInlineStyle('span', {'class' : v['class']}, {check_classes : cl});
-				}
 				return false; // No auto select
 			}});
 			if (c) {