L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-51956-master' of git://github.com/ryanwyllie/moodle

Browse Source
This commit is contained in:
Andrew Nicols
2015-10-29 11:06:18 +08:00
parent de342562cc 1c53bc813e
commit 68881fb620
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/editor/atto/plugins/table/styles.css
+3
View File
@@ -34,3 +34,6 @@ div.availablecolors label input[type="radio"] {
margin-left: -15px;
}
input[name="bordersize"], input[name="width"] {
margin-right: 0.3em;
}
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
Vendored
+5 -5
View File
@@ -39,7 +39,7 @@ var COMPONENT = 'atto_table',
BORDERWIDTH: '1'
},
DIALOGUE = {
WIDTH: '450px'
WIDTH: '480px'
},
TEMPLATE = '' +
'<form class="{{CSS.FORM}}">' +
@@ -162,7 +162,7 @@ var COMPONENT = 'atto_table',
'{{#if allowWidth}}' +
'<label for="{{elementid}}_atto_table_width" class="sameline">' +
'{{get_string "width" component}}</label>' +
'<input id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
'<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
'<label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label>' +
'<br>' +
'{{/if}}' +
@@ -1176,7 +1176,7 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}
if (backgroundcolourvalue !== 'none') {
tableNode.setStyle('background-color', backgroundcolourvalue);
tableNode.setStyle('backgroundColor', backgroundcolourvalue);
}
if (configuration.width && configuration.width.get('value')) {
@@ -1231,8 +1231,8 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
captionpositioninput.set('value', '');
}
if (table.getStyle('background-color') && this.get('allowBackgroundColour')) {
hexColour = Y.Color.toHex(table.getStyle('background-color'));
if (table.getStyle('backgroundColor') && this.get('allowBackgroundColour')) {
hexColour = Y.Color.toHex(table.getStyle('backgroundColor'));
matchedInput = backgroundcolours.filter('[value="' + hexColour + '"]');
if (matchedInput) {
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
Vendored
+3 -3
View File
File diff suppressed because one or more lines are too long
lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
Vendored
+5 -5
View File
@@ -39,7 +39,7 @@ var COMPONENT = 'atto_table',
BORDERWIDTH: '1'
},
DIALOGUE = {
WIDTH: '450px'
WIDTH: '480px'
},
TEMPLATE = '' +
'<form class="{{CSS.FORM}}">' +
@@ -162,7 +162,7 @@ var COMPONENT = 'atto_table',
'{{#if allowWidth}}' +
'<label for="{{elementid}}_atto_table_width" class="sameline">' +
'{{get_string "width" component}}</label>' +
'<input id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
'<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
'<label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label>' +
'<br>' +
'{{/if}}' +
@@ -1176,7 +1176,7 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}
if (backgroundcolourvalue !== 'none') {
tableNode.setStyle('background-color', backgroundcolourvalue);
tableNode.setStyle('backgroundColor', backgroundcolourvalue);
}
if (configuration.width && configuration.width.get('value')) {
@@ -1231,8 +1231,8 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
captionpositioninput.set('value', '');
}
if (table.getStyle('background-color') && this.get('allowBackgroundColour')) {
hexColour = Y.Color.toHex(table.getStyle('background-color'));
if (table.getStyle('backgroundColor') && this.get('allowBackgroundColour')) {
hexColour = Y.Color.toHex(table.getStyle('backgroundColor'));
matchedInput = backgroundcolours.filter('[value="' + hexColour + '"]');
if (matchedInput) {
lib/editor/atto/plugins/table/yui/src/button/js/button.js
Vendored
+5 -5
View File
@@ -37,7 +37,7 @@ var COMPONENT = 'atto_table',
BORDERWIDTH: '1'
},
DIALOGUE = {
WIDTH: '450px'
WIDTH: '480px'
},
TEMPLATE = '' +
'<form class="{{CSS.FORM}}">' +
@@ -160,7 +160,7 @@ var COMPONENT = 'atto_table',
'{{#if allowWidth}}' +
'<label for="{{elementid}}_atto_table_width" class="sameline">' +
'{{get_string "width" component}}</label>' +
'<input id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
'<input name="width" id="{{elementid}}_atto_table_width" class="{{CSS.WIDTH}}" size="8" type="number" min="0" max="100"/>' +
'<label style="display: inline-block;">{{CSS.WIDTHUNIT}}</label>' +
'<br>' +
'{{/if}}' +
@@ -1174,7 +1174,7 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
}
if (backgroundcolourvalue !== 'none') {
tableNode.setStyle('background-color', backgroundcolourvalue);
tableNode.setStyle('backgroundColor', backgroundcolourvalue);
}
if (configuration.width && configuration.width.get('value')) {
@@ -1229,8 +1229,8 @@ Y.namespace('M.atto_table').Button = Y.Base.create('button', Y.M.editor_atto.Edi
captionpositioninput.set('value', '');
}
if (table.getStyle('background-color') && this.get('allowBackgroundColour')) {
hexColour = Y.Color.toHex(table.getStyle('background-color'));
if (table.getStyle('backgroundColor') && this.get('allowBackgroundColour')) {
hexColour = Y.Color.toHex(table.getStyle('backgroundColor'));
matchedInput = backgroundcolours.filter('[value="' + hexColour + '"]');
if (matchedInput) {