v1.0

只读模式
group, 分享
评论更多问题
博客标签总是存在一个

public/tinymce/classes/ui/Form.js

@@ -27,8 +27,9 @@
  */
 define("tinymce/ui/Form", [
 	"tinymce/ui/Container",
-	"tinymce/ui/FormItem"
-], function(Container, FormItem) {
+	"tinymce/ui/FormItem",
+	"tinymce/util/Tools"
+], function(Container, FormItem, Tools) {
 	"use strict";
 
 	return Container.extend({
@@ -56,23 +57,34 @@ define("tinymce/ui/Form", [
 		preRender: function() {
 			var self = this, items = self.items();
 
+			if (!self.settings.formItemDefaults) {
+				self.settings.formItemDefaults = {
+					layout: 'flex',
+					autoResize: "overflow",
+					defaults: {flex: 1}
+				};
+			}
+
 			// Wrap any labeled items in FormItems
 			items.each(function(ctrl) {
 				var formItem, label = ctrl.settings.label;
 
 				if (label) {
-					formItem = new FormItem({
-						layout: 'flex',
-						autoResize: "overflow",
-						defaults: {flex: 1},
-						items: [
-							{type: 'label', text: label, flex: 0, forId: ctrl._id}
-						]
-					});
+					formItem = new FormItem(Tools.extend({
+						items: {
+							type: 'label',
+							id: ctrl._id + '-l',
+							text: label,
+							flex: 0,
+							forId: ctrl._id,
+							disabled: ctrl.disabled()
+						}
+					}, self.settings.formItemDefaults));
 
 					formItem.type = 'formitem';
+					ctrl.aria('labelledby', ctrl._id + '-l');
 
-					if (typeof(ctrl.settings.flex) == "undefined") {
+					if (typeof ctrl.settings.flex == "undefined") {
 						ctrl.settings.flex = 1;
 					}
 
@@ -88,13 +100,19 @@ define("tinymce/ui/Form", [
 		 * @private
 		 */
 		recalcLabels: function() {
-			var self = this, maxLabelWidth = 0, labels = [], i, labelGap;
+			var self = this, maxLabelWidth = 0, labels = [], i, labelGap, items;
 
 			if (self.settings.labelGapCalc === false) {
 				return;
 			}
 
-			self.items().filter('formitem').each(function(item) {
+			if (self.settings.labelGapCalc == "children") {
+				items = self.find('formitem');
+			} else {
+				items = self.items();
+			}
+
+			items.filter('formitem').each(function(item) {
 				var labelCtrl = item.items()[0], labelWidth = labelCtrl.getEl().clientWidth;
 
 				maxLabelWidth = labelWidth > maxLabelWidth ? labelWidth : maxLabelWidth;