Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2024-12-22 07:13:08 -05:00
Code Issues Activity

Support American and English Spelling of Colour.

Browse source 
This commit makes this change non-breaking.
This commit is contained in:
Matthew Borden 2015-01-04 22:09:54 +00:00
parent f035e8cbec
commit 53cd638e1e
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Demo.html
View file

@ -58,7 +58,7 @@
<span id="setFontFace" class="prompt">Font face</span>
</p>
<p>
<span id="setTextColour" class="prompt">Text color</span>
<span id="setTextColor" class="prompt">Text colour</span>
<span id="setHighlightColor" class="prompt">Text highlight</span>
<span id="makeLink" class="prompt">Link</span>
</p>

6
README.md
View file

@ -250,13 +250,13 @@ This method takes one argument:
Returns self (the Squire instance).
### setTextColour
### setTextColor
Sets the colour of the selected text.
This method takes one argument:
* **colour**: The colour to set. Any CSS colour value is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
* **color**: The colour to set. Any CSS color value is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
Returns self (the Squire instance).
@ -266,7 +266,7 @@ Sets the colour of the background of the selected text.
This method takes one argument:
* **colour**: The colour to set. Any CSS colour value is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
* **color**: The colour to set. Any CSS color value is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
Returns self (the Squire instance).

4
build/squire-raw.js
View file

@ -3361,7 +3361,7 @@ proto.setFontSize = function ( size ) {
return this.focus();
};
proto.setTextColour = function ( colour ) {
proto.setTextColor = proto.setTextColour =function ( colour ) {
this.changeFormat({
tag: 'SPAN',
attributes: {
@ -3375,7 +3375,7 @@ proto.setTextColour = function ( colour ) {
return this.focus();
};
proto.setHighlightColor = function ( colour ) {
proto.setHighlightColor = proto.setHighlightColour = function ( colour ) {
this.changeFormat({
tag: 'SPAN',
attributes: {

2
build/squire.js
View file

File diff suppressed because one or more lines are too long

8
source/Editor.js
View file

@ -2283,12 +2283,12 @@ proto.setFontSize = function ( size ) {
return this.focus();
};
proto.setTextColour = function ( colour ) {
proto.setTextColor = proto.setTextColour =function ( color ) {
this.changeFormat({
tag: 'SPAN',
attributes: {
'class': 'colour',
style: 'color: ' + colour
style: 'color: ' + color
}
}, {
tag: 'SPAN',
@ -2297,12 +2297,12 @@ proto.setTextColour = function ( colour ) {
return this.focus();
};
proto.setHighlightColor = function ( colour ) {
proto.setHighlightColor = proto.setHighlightColour = function ( color ) {
this.changeFormat({
tag: 'SPAN',
attributes: {
'class': 'highlight',
style: 'background-color: ' + colour
style: 'background-color: ' + color
}
}, {
tag: 'SPAN',