Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
Conflicts:
	Source/Drag/Drag.Move.js
  • Loading branch information
lorenzos committed Jul 7, 2014
2 parents 19921d7 + 743a34d commit f35dde6
Show file tree
Hide file tree
Showing 213 changed files with 10,084 additions and 1,099 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ mootools-more.js
*.tmp*
*.swp
*~
node_modules
mootools-more-all.js
mootools-more-nocompat.js
mootools-more-specs.js
sauce*.log
42 changes: 42 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
language: node_js

node_js:
- 0.11

env:
matrix:
- BROWSER='chrome_linux' BUILD='default'
- BROWSER='firefox_linux' BUILD='default'
- BROWSER='opera_win2000' BUILD='default'
- BROWSER='safari7' BUILD='default'
- BROWSER='safari6' BUILD='default'
- BROWSER='safari5_osx10_6' BUILD='default'
- BROWSER='safari5_win7' BUILD='default'
- BROWSER='ie11' BUILD='default'
- BROWSER='ie10' BUILD='default'
- BROWSER='ie9' BUILD='default'
- BROWSER='ie8' BUILD='default'
- BROWSER='ie7' BUILD='default'
# - BROWSER='ie6' BUILD='default'

- BROWSER='chrome_linux' BUILD='nocompat'
- BROWSER='firefox_linux' BUILD='nocompat'
- BROWSER='opera_win2000' BUILD='nocompat'
- BROWSER='safari7' BUILD='nocompat'
- BROWSER='safari6' BUILD='nocompat'
- BROWSER='safari5_osx10_6' BUILD='nocompat'
- BROWSER='safari5_win7' BUILD='nocompat'
- BROWSER='ie11' BUILD='nocompat'
- BROWSER='ie10' BUILD='nocompat'
- BROWSER='ie9' BUILD='nocompat'
- BROWSER='ie8' BUILD='nocompat'
- BROWSER='ie7' BUILD='nocompat'
# - BROWSER='ie6' BUILD='nocompat'

global:
- secure: JeMoJiA110e1Lz9T2VGILe1e/+XD0bjhKoT351FhdMZLJZD4OwuPrSg3+nVj5Lb4Ih8SAAnAhOiach+Ybnm/Ox1JXuqOH6dagRT5nsg2Gx3Alds1aeO43xKsJMhAg6YI8uWNCesgK5NbbDF77qubxDOElO1J6XGWccfV/jz5ZJ8=
- secure: QgH0vS5WM5Pqe5rxYo5QSEKOlezA6UJr6199528Lbii6TWgcEC7hi4M77DDMTJMkw80Us4AlXbEHJvPhjgd0SrnurP39x967yZRdfEntzPshMx8ye7FsyG7u4UOXKmynzhYTVO9Ehki2W8DE67x7HyUJC3Vgqe4XNb+4cMvN1+w=

before_script:
- npm install grunt-cli -g
- curl https://gist.github.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash
2 changes: 1 addition & 1 deletion Docs/Drag/Drag.Move.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Drag.Move Method: constructor
All the base Drag options, plus:

* container - (*element*) If an Element is passed, drag will be limited to the passed Element's size and position.
* droppables - (*array*) The Elements that the draggable can drop into. The class's drop, enter, and leave events will be fired in conjunction with interaction with one of these elements.
* droppables - (*array*, *string*) The Elements or a CSS selector that the draggable can drop into. The class's drop, enter, and leave events will be fired in conjunction with interaction with one of these elements.
* precalculate - (*boolean*; defaults to *false*) If *true*, the class will calculate the locations and dimensions of the droppables which will increase performance. If the droppables are likely to change shape, size, or location it is best to leave this as *false*.
* includeMargins - (*boolean*; defaults to *true*) This option only applies when the container option is set. If *true* (the default) the margins are included in the calculations for the bounding box of the draggable item. This means that if you have a margin on your draggable then the border of the draggable can never touch the edge of the container. Setting it to false ignores this margin.
* checkDroppables - (*boolean*; defaults to *true*) Checks against the droppables on drag if *true*.
Expand Down
15 changes: 12 additions & 3 deletions Docs/Drag/Slider.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Slider Method: constructor
4. wheel - (*boolean*: defaults to false) True if you want the ability to move the knob by mousewheeling.
5. steps - (*number*: defaults to 100) The number of steps the Slider should move/tick.
6. mode - (*string*: defaults to horizontal) The type of Slider can be either 'horizontal' or 'vertical' in movement.
6. initialStep - (*number*: defaults to 0) The step the slider will start at.
6. initialStep - (*number*: defaults to range minimum value, or 0 if range is not set) The step the slider will start at.

### Events

Expand All @@ -49,9 +49,9 @@ Fires when the Slider's value changes.
1. step - (*number*) The current step that the Slider is on.


#### onComplete
#### complete

Fire when you're done dragging.
Fires when you're done dragging.

##### Signature

Expand Down Expand Up @@ -79,6 +79,15 @@ Fires when the user scrolls or when the container element is clicked. This Event
- By default Slider uses the 'tick' event to set the style of the knob to a new position.


#### move

Fires when the knob is moved, whether by dragging or by changing the value of the slider.

##### Signature

onMove()


### Returns

* (*object*) A new Slider instance.
Expand Down
38 changes: 19 additions & 19 deletions Docs/Drag/Sortables.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Fired when the item is inserted into a new place in one of the lists.

#### complete

Fired when the item ends dragging. Note: fires even if the sort has not changed.
Fired when the item ends dragging, even if the sort has not changed.

##### Signature:

Expand All @@ -76,21 +76,21 @@ Fired when the item ends dragging. Note: fires even if the sort has not changed.
var mySortables = new Sortables('list-1', {
revert: { duration: 500, transition: 'elastic:out' }
});
//creates a new Sortable instance over the list with id 'list-1' with some
//extra options for the revert effect
// Creates a new Sortable instance over the list with id 'list-1' with some
// extra options for the revert effect.

var mySortables = new Sortables('#list-1, #list-2', {
constrain: true,
clone: false,
revert: true
});
//creates a new Sortable instance allowing the sorting of the lists with
//ids 'list-1' and 'list-2' with extra options since constrain was set to
//true, the items will not be able to be dragged from one list to the other
// Creates a new Sortable instance allowing the sorting of the lists with
// ids 'list-1' and 'list-2' with extra options: since constrain was set to
// true, the items will not be able to be dragged from one list to the other.

var mySortables = new Sortables('#list-1, #list-2, #list-3');
//creates a new Sortable instance allowing sorting between the lists with
//ids 'list-1', 'list-2, and 'list-3'
// Creates a new Sortable instance allowing sorting between the lists with
// ids 'list-1', 'list-2, and 'list-3'.

Sortables Method: attach {#Sortables:attach}
--------------------------------------------
Expand Down Expand Up @@ -251,7 +251,7 @@ Sortables Method: serialize {#Sortables:serialize}
--------------------------------------------------

Function to get the order of the elements in the lists of this sortables instance.
For each list, an array containing the order of the elements will be returned.
For each list, an array containing the *id* of all the elements (in the current order) will be returned.
If more than one list is being used, all lists will be serialized and returned in an array.

### Syntax:
Expand All @@ -260,26 +260,26 @@ If more than one list is being used, all lists will be serialized and returned i

### Arguments:

1. index - (*mixed*, optional) An integer or boolean false. index of the list to serialize. Omit or pass false to serialize all lists.
2. modifier - (*function*, optional) A function to override the default output of the sortables. See Examples below
1. index - (*mixed*, optional) An integer or boolean false. This is the zero-based index of the list to serialize. Omit or pass false to serialize all lists.
2. modifier - (*function*, optional) A function to override the default output of the sortables. See Examples below.

### Examples:

mySortables.serialize(1);
//returns the second list serialized (remember, arrays are 0 based...);
//['item_1-1', 'item_1-2', 'item_1-3']
// Returns ids from the second list (remember, index is zero-based):
// ['item_1-1', 'item_1-2', 'item_1-3']

mySortables.serialize();
//returns a nested array of all lists serialized, or if only one list exists, that lists order
/*[['item_1-1', 'item_1-2', 'item_1-3'],
['item_2-1', 'item_2-2', 'item_2-3'],
['item_3-1', 'item_3-2', 'item_3-3']]*/
// Returns a nested array of all lists serialized or, if only one list exists, that lists order:
/* [['item_1-1', 'item_1-2', 'item_1-3'],
['item_2-1', 'item_2-2', 'item_2-3'],
['item_3-1', 'item_3-2', 'item_3-3']] */

mySortables.serialize(2, function(element, index){
return element.getProperty('id').replace('item_','') + '=' + index;
}).join('&');
//joins the array with a '&' to return a string of the formatted ids of all the elmements in list 3,with their position
//'3-0=0&3-1=1&3-2=2'
// Joins the array with a '&' to return a string of the formatted ids of all the elements in the third list, with their position:
// '3-0=0&3-1=1&3-2=2'


[Drag.Move]: /more/Drag/Drag.Move
Expand Down
4 changes: 2 additions & 2 deletions Docs/Element/Element.Forms.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ Inserts a value at the cursor location; if text is selected, it replaces this te
$('myInput').insertAtCursor("<br />");
$('myInput').insertAtCursor("type something here", true);

Element Method: insertAroundCursor
----------------------------------
Element Method: insertAroundCursor {#Element:insertAroundCursor}
----------------------------------------------------------------

Inserts two strings around the selected text.

Expand Down
14 changes: 7 additions & 7 deletions Docs/Forms/Form.Request.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Changes the target that the instance will update with the Request response.

### Syntax

myFormRequest.setTarget(newTarget);
myformUpdate.setTarget(newTarget);

### Arguments

Expand All @@ -66,7 +66,7 @@ Sends the form.

### Syntax

myFormRequest.send();
myformUpdate.send();

### Returns

Expand All @@ -79,7 +79,7 @@ Detaches the Form.Request from the form (disabling the ajax).

### Syntax

myFormRequest.disable();
myformUpdate.disable();

### Returns

Expand All @@ -92,7 +92,7 @@ Attaches the Form.Request to the form (enabling the ajax). Note that this is don

### Syntax

myFormRequest.enable();
myformUpdate.enable();

### Returns

Expand All @@ -103,14 +103,14 @@ Type: Element {#Element}

Extends the [Element][] Type with a reference to its [Form.Request][] instance and a method to create one.

Element Method: formRequest {#Element:formRequest}
Element Method: formUpdate {#Element:formUpdate}
-------------------------------------

Creates a new instance of [Form.Request][] and calls its *send* method.

### Syntax

$(element).formRequest(update, options);
$(element).formUpdate(update, options);

### Arguments

Expand All @@ -123,7 +123,7 @@ Creates a new instance of [Form.Request][] and calls its *send* method.

### Example

$(element).formRequest($('myDiv'), { requestOptions: {useSpinner: false } });
$(element).formUpdate($('myDiv'), { requestOptions: {useSpinner: false } });

Element property: form.request {#Element:form.request}
------------------------------------------------
Expand Down
3 changes: 2 additions & 1 deletion Docs/Interface/HtmlTable.Sort.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,14 @@ Sorts a column.

### Syntax

myHtmlTable.sort(index, reverse, prepare);
myHtmlTable.sort(index, reverse, prepare[, sort]);

### Arguments

1. index - (*number*) the index of the column to sort
2. reverse - (*boolean*) reverses the sort if *true*; defaults to *false*
3. prepare - (*boolean*) if the sort has a secondary sort, set this value to *true* on the first sort, and *false* on the second. For example, if you sorted a directory list of files first by type and then secondly by file size, you would sort on type and pass *true* and then sort on size and pass *false*.
4. sort - (*function*, optional) this custom function will be used to sort the column. The parameters passed to _sort_ are objects with *position* and *value*.

### Returns

Expand Down
28 changes: 19 additions & 9 deletions Docs/Interface/Scroller.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Scroller Method: constructor

### Arguments

1. element - (*element*) The element to scroll.
1. element - (*mixed*) The element to scroll, or it's id.
2. options - (*object*, optional) An object for the Scroller instance's options.

#### Options :
Expand All @@ -47,15 +47,25 @@ Scroller Method: constructor

#### Examples

var myScroller = new Scroller(window, {
area: Math.round(window.getWidth() / 5)
new Element('div', {
styles: {
width: 600,
height: 400
}
}).inject(new Element('div', {
id: 'myScroll',
styles: {
width: 300,
height: 200,
overflow: 'scroll'
}
}).inject($(document.body)))


var myScroller = new Scroller('myScroll', {
area: Math.round(window.getWidth() / 10)
});

(function(){
this.stop();
this.start();
}).periodical(1000, myScroller);

myScroller.start();


Scroller Method: start {#Scroller:start}
Expand Down
35 changes: 35 additions & 0 deletions Docs/Locale/Date.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@ Available Languages
<th>Locale Code</th>
<th>Authors</th>
</tr>
<tr>
<td>Afrikaans</td>
<td>af-ZA</td>
<td>Werner Mollentze</td>
</tr>
<tr>
<td>Arabic</td>
<td>ar</td>
Expand All @@ -45,6 +50,16 @@ Available Languages
<td>zh-CHT</td>
<td>YMind Chan</td>
</tr>
<tr>
<td>Chinese (simplified)</td>
<td>zh-CHS</td>
<td>YMind Chan</td>
</tr>
<tr>
<td>Chinese (simplified and traditional)</td>
<td>zh-CH</td>
<td>YMind Chan</td>
</tr>
<tr>
<td>Czech</td>
<td>cs-CZ</td>
Expand Down Expand Up @@ -95,6 +110,16 @@ Available Languages
<td>de-DE</td>
<td>Frank Rossi, Ulrich Petri</td>
</tr>
<tr>
<td>Greek</td>
<td>el-GR</td>
<td>Periklis Argiriadis</td>
</tr>
<tr>
<td>Hebrew</td>
<td>he-IL</td>
<td>Elad Ossadon</td>
</tr>
<tr>
<td>Hungarian</td>
<td>hu-HU</td>
Expand Down Expand Up @@ -140,6 +165,11 @@ Available Languages
<td>ru-RU</td>
<td>Evstigneev Pavel</td>
</tr>
<tr>
<td>Slovak</td>
<td>sk-SK</td>
<td>Ivan Masár</td>
</tr>
<tr>
<td>Slovenian</td>
<td>si-SI</td>
Expand All @@ -155,6 +185,11 @@ Available Languages
<td>es-ES</td>
<td>Ãlfons Sanchez</td>
</tr>
<tr>
<td>Spanish (Venezuela)</td>
<td>es-VE</td>
<td>Daniel Barreto</td>
</tr>
<tr>
<td>Swedish</td>
<td>sv-SE</td>
Expand Down
Loading

0 comments on commit f35dde6

Please sign in to comment.