Fixed support for loading themes from external URLs.

Moved spellchecker JS files into the development package.

JSTrim.config

@@ -91,4 +91,5 @@
 	<trim src="jscripts/tiny_mce/plugins/safari/editor_plugin_src.js" dest="jscripts/tiny_mce/plugins/safari/editor_plugin.js" />
 	<trim src="jscripts/tiny_mce/plugins/compat2x/editor_plugin_src.js" dest="jscripts/tiny_mce/plugins/compat2x/editor_plugin.js" />
 	<trim src="jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js" dest="jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js" />
+	<trim src="jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js" dest="jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js" />
 </jstrim>

changelog.txt

@@ -1,3 +1,6 @@
+Version 3.0b2 (2007-11-xx)
+	Fixed support for loading themes from external URLs.
+	Moved spellchecker JS files into the development package.
 Version 3.0b1 (2007-11-21)
 	Added new tab_focus option, that enables you to specify a element id or that the next element to be focused on tab key down.
 	Added new addQueryValueHandler method to the tinymce.Editor class.

jscripts/tiny_mce/classes/Editor.js

@@ -139,12 +139,6 @@
 
 			t.windowManager = new tinymce.WindowManager(t);
 
-			// Setup popup CSS path(s)
-			s.popup_css = t.baseURI.toAbsolute(s.popup_css || "themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
-
-			if (s.popup_css_add)
-				s.popup_css += ',' + s.popup_css_add;
-
 			if (s.encoding == 'xml') {
 				t.onGetContent.add(function(ed, o) {
 					if (o.get)
@@ -194,7 +188,9 @@
 			// Load scripts
 			function loadScripts() {
 				sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
-				ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+
+				if (s.theme.charAt(0) != '-')
+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
 
 				each(s.plugins.split(','), function(p) {
 					if (p && p.charAt(0) != '-') {
@@ -245,6 +241,7 @@
 			EditorManager.add(t);
 
 			// Create theme
+			s.theme = s.theme.replace(/-/, '');
 			o = ThemeManager.get(s.theme);
 			t.theme = new o();
 
@@ -265,6 +262,12 @@
 				}
 			});
 
+			// Setup popup CSS path(s)
+			s.popup_css = t.baseURI.toAbsolute(s.popup_css || "themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
+
+			if (s.popup_css_add)
+				s.popup_css += ',' + s.popup_css_add;
+
 			// Setup control factory
 			t.controlManager = new tinymce.ControlManager(t);
 			t.undoManager = new tinymce.UndoManager(t);

jscripts/tiny_mce/classes/EditorManager.js

@@ -63,7 +63,7 @@
 					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
 
 				// Load theme
-				if (s.theme)
+				if (s.theme && s.theme.charAt(0) != '-')
 					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
 
 				// Load plugins

jscripts/tiny_mce/classes/tinymce.js

@@ -34,6 +34,15 @@ var tinymce = {
 		t.isGecko = !t.isWebKit && /Gecko/.test(ua);
 //		t.isGecko3 = t.isGecko && /(Firefox|Minefield)\/[3-9]/.test(ua);
 		t.isMac = ua.indexOf('Mac') != -1;
+
+		// TinyMCE .NET webcontrol might be setting the values for TinyMCE
+		if (window.tinyMCEPreInit) {
+			t.suffix = tinyMCEPreInit.suffix;
+			t.baseURL = tinyMCEPreInit.base;
+			return;
+		}
+
+		// Get suffix and base
 		t.suffix = '';
 
 		function getBase(n) {