Wordpress 3.1

[autoinstalls/wordpress.git] / wp-includes / js / tinymce / utils / form_utils.js

diff --git a/wp-includes/js/tinymce/utils/form_utils.js b/wp-includes/js/tinymce/utils/form_utils.js
index 6d79d0a0366b28485921216478da3391cd609559..c583837c048646f228d6da08cb1d08e5bfede3c7 100644 (file)
--- a/wp-includes/js/tinymce/utils/form_utils.js
+++ b/wp-includes/js/tinymce/utils/form_utils.js
@@ -1,10 +1,11 @@
 /**
- * $Id: form_utils.js 673 2008-03-06 13:26:20Z spocke $
+ * form_utils.js
  *
- * Various form utilitiy functions.
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
  *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
  */
 
 var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
@@ -13,7 +14,7 @@ function getColorPickerHTML(id, target_form_element) {
        var h = "";
 
        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') + '"></span></a>';
+       h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
 
        return h;
 }
@@ -50,7 +51,7 @@ function getBrowserHTML(id, target_form_element, type, prefix) {
 
        html = "";
        html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
-       html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
+       html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';
 
        return html;
 }
@@ -92,7 +93,7 @@ function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
 function getSelectValue(form_obj, field_name) {
        var elm = form_obj.elements[field_name];
 
-       if (elm == null || elm.options == null)
+       if (elm == null || elm.options == null || elm.selectedIndex === -1)
                return "";
 
        return elm.options[elm.selectedIndex].value;