Kranitor #1: On-boarding
'''Kranitor commits''' are commits by Krinkle with his janitor hat on.
Must never contain functional changes mixed with miscellaneous changes.
.gitignore:
* Add .DS_Store to the ignore list so that browsing the directories
on Mac OS X, will not add these files to the list of untracked
files.
* Fix missing newline at end of file
.jshintrc
* raises -> throws
* +module (QUnit.module)
* remove 'Node' (as of node-jshint 1.7.2 this is now part of
'browser:true', as it should be)
Authors:
* Adding myself
MWExtension/VisualEditor.php
* Fix default value of wgVisualEditorParsoidURL to not
point to the experimental instance in WMF Labs.
Issues:
* ve.ce.TextNode:
- Fix TODO: Don't perform a useless clone of an already-jQuerified object.
- Use .html() to set html content instead of encapsulating between
two strings. This is slightly faster but more importantly safer,
and prevents situations where the resulting jQuery collection
actually contains 2 elements instead of 1, thus messing up
what .contents() is iterating over.
* ve.ce.Document.test.js
- Fix: ReferenceError: assert is not defined
* ve.dm.Document.test.js
- Fix: ReferenceError: assert is not defined
* ve.dm.Transaction.test.js
- Fix: ReferenceError: assert is not defined
* ve.dm.TransactionProcessor.test.js
- Fix: ReferenceError: assert is not defined
* ext.visualEditor.viewPageTarget
- Missing dependency on 'mediawiki.Title'
Code conventions / Misc cleanup
* Various JSHint warnings.
* Whitespace
* jQuery(): Use '<tag>' for element creation,
use '<valid><xml/></valid>' for parsing
* Use the default operator instead of ternary when the condition and
first value are the same.
x = foo ? foo : bar; -> x = foo || bar;
Because contrary to some programming language (PHP...), in JS the
default operator does not enforce a boolean result but returns the
original value, hence it being called the 'default' operator, as
opposed to the 'or' operator.
* No need to call addClass() twice, it takes a space-separated list
(jQuery splits by space and adds if needed)
* Use .on( event[, selector], fn ) instead of the deprecated
routers to it such as .bind(), .delegate() and .live().
All these three are now built-in and fully compatible with .on()
* Add 'XXX:' comments for suspicious code that I don't want to change
as part of a clean up commit.
* Remove unused variables (several var x = this; where x was not
used anywhere, possibly from boilerplate copy/paste)
* Follows-up Trevor's commit that converts test suites to the new
QUnit format. Also removed the globals since we no longer use those
any more.
Change-Id: I7e37c9bff812e371c7f65a6fd85d9e2af3e0a22f
2012-07-27 08:43:33 +00:00
|
|
|
( function ( QUnit ) {
|
2012-07-10 19:46:08 +00:00
|
|
|
|
2012-10-25 20:06:07 +00:00
|
|
|
QUnit.config.requireExpects = true;
|
|
|
|
|
2012-07-10 19:46:08 +00:00
|
|
|
/**
|
|
|
|
* Builds a summary of a node tree.
|
|
|
|
*
|
|
|
|
* Generated summaries contain node types, lengths, outer lengths, attributes and summaries for
|
2012-08-16 17:53:33 +00:00
|
|
|
* each child recursively. It's simple and fast to use deepEqual on this.
|
2012-07-10 19:46:08 +00:00
|
|
|
*
|
|
|
|
* @method
|
|
|
|
* @param {ve.Node} node Node tree to summarize
|
|
|
|
* @param {Boolean} [shallow] Do not summarize each child recursively
|
|
|
|
* @returns {Object} Summary of node tree
|
|
|
|
*/
|
|
|
|
function getNodeTreeSummary( node, shallow ) {
|
|
|
|
var i,
|
|
|
|
summary = {
|
2012-10-25 20:06:07 +00:00
|
|
|
'getType': node.getType(),
|
|
|
|
'getLength': node.getLength(),
|
|
|
|
'getOuterLength': node.getOuterLength(),
|
2012-11-23 23:16:08 +00:00
|
|
|
'element': node.element
|
2012-11-19 22:19:13 +00:00
|
|
|
},
|
|
|
|
numChildren;
|
2012-10-25 20:06:07 +00:00
|
|
|
|
2012-07-10 19:46:08 +00:00
|
|
|
if ( node.children !== undefined ) {
|
2012-11-19 22:19:13 +00:00
|
|
|
// Count children manually to exclude zero-length text nodes
|
|
|
|
numChildren = 0;
|
2012-07-10 19:46:08 +00:00
|
|
|
if ( !shallow ) {
|
|
|
|
summary.children = [];
|
2012-11-19 22:19:13 +00:00
|
|
|
}
|
|
|
|
for ( i = 0; i < node.children.length; i++ ) {
|
|
|
|
if ( node.children[i].getType() !== 'text' || node.children[i].getLength() > 0 ) {
|
|
|
|
numChildren++;
|
|
|
|
if ( !shallow ) {
|
|
|
|
summary.children.push( getNodeTreeSummary( node.children[i] ) );
|
|
|
|
}
|
2012-07-10 19:46:08 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return summary;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Builds a summary of a node selection.
|
|
|
|
*
|
|
|
|
* Generated summaries contain length of results as well as node summaries, ranges, indexes, indexes
|
|
|
|
* within parent and node ranges for each result. It's simple and fast to use deepEqual on this.
|
|
|
|
*
|
|
|
|
* @method
|
|
|
|
* @param {Object[]} selection Selection to summarize
|
|
|
|
* @returns {Object} Summary of selection
|
|
|
|
*/
|
|
|
|
function getNodeSelectionSummary( selection ) {
|
|
|
|
var i,
|
|
|
|
summary = {
|
2012-10-25 20:06:07 +00:00
|
|
|
'length': selection.length
|
|
|
|
};
|
|
|
|
|
2012-07-10 19:46:08 +00:00
|
|
|
if ( selection.length ) {
|
|
|
|
summary.results = [];
|
|
|
|
for ( i = 0; i < selection.length; i++ ) {
|
|
|
|
summary.results.push( {
|
|
|
|
'node': getNodeTreeSummary( selection[i].node, true ),
|
|
|
|
'range': selection[i].range,
|
|
|
|
'index': selection[i].index,
|
|
|
|
'indexInNode': selection[i].indexInNode,
|
|
|
|
'nodeRange': selection[i].nodeRange,
|
2012-10-19 22:28:26 +00:00
|
|
|
'nodeOuterRange': selection[i].nodeOuterRange,
|
|
|
|
'parentOuterRange': selection[i].parentOuterRange
|
2012-07-10 19:46:08 +00:00
|
|
|
} );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return summary;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Builds a summary of an HTML element.
|
|
|
|
*
|
|
|
|
* Summaries include node name, text, attributes and recursive summaries of children.
|
|
|
|
*
|
|
|
|
* @method
|
2012-10-25 20:06:07 +00:00
|
|
|
* @param {HTMLElement} element Element to summarize.
|
|
|
|
* @returns {Object} Summary of element.
|
2012-07-10 19:46:08 +00:00
|
|
|
*/
|
|
|
|
function getDomElementSummary( element ) {
|
2012-10-25 20:06:07 +00:00
|
|
|
var i,
|
|
|
|
$element = $( element ),
|
2012-07-10 19:46:08 +00:00
|
|
|
summary = {
|
|
|
|
'type': element.nodeName.toLowerCase(),
|
|
|
|
'text': $element.text(),
|
|
|
|
'attributes': {},
|
|
|
|
'children': []
|
2012-10-25 20:06:07 +00:00
|
|
|
};
|
|
|
|
|
2012-07-10 19:46:08 +00:00
|
|
|
// Gather attributes
|
2012-11-20 04:01:09 +00:00
|
|
|
if ( element.attributes ) {
|
|
|
|
for ( i = 0; i < element.attributes.length; i++ ) {
|
|
|
|
summary.attributes[element.attributes[i].name] = element.attributes[i].value;
|
|
|
|
}
|
2012-07-10 19:46:08 +00:00
|
|
|
}
|
|
|
|
// Summarize children
|
2012-11-20 04:01:09 +00:00
|
|
|
if ( element.childNodes ) {
|
|
|
|
for ( i = 0; i < element.childNodes.length; i++ ) {
|
|
|
|
if ( element.childNodes[i].nodeType !== Node.TEXT_NODE ) {
|
|
|
|
summary.children.push( getDomElementSummary( element.childNodes[i] ) );
|
|
|
|
}
|
|
|
|
}
|
2012-07-10 19:46:08 +00:00
|
|
|
}
|
|
|
|
return summary;
|
|
|
|
}
|
|
|
|
|
2012-08-07 01:50:44 +00:00
|
|
|
QUnit.assert.equalNodeTree = function ( actual, expected, shallow, message ) {
|
2012-07-10 19:46:08 +00:00
|
|
|
if ( typeof shallow === 'string' && arguments.length === 3 ) {
|
|
|
|
message = shallow;
|
|
|
|
shallow = undefined;
|
|
|
|
}
|
|
|
|
var actualSummary = getNodeTreeSummary( actual, shallow ),
|
|
|
|
expectedSummary = getNodeTreeSummary( expected, shallow );
|
|
|
|
QUnit.push(
|
|
|
|
QUnit.equiv( actualSummary, expectedSummary ), actualSummary, expectedSummary, message
|
|
|
|
);
|
|
|
|
};
|
|
|
|
|
2012-08-07 01:50:44 +00:00
|
|
|
QUnit.assert.equalNodeSelection = function ( actual, expected, message ) {
|
2012-10-22 22:52:19 +00:00
|
|
|
var i,
|
|
|
|
actualSummary = getNodeSelectionSummary( actual ),
|
2012-07-10 19:46:08 +00:00
|
|
|
expectedSummary = getNodeSelectionSummary( expected );
|
2012-10-25 20:06:07 +00:00
|
|
|
|
2012-10-19 20:56:46 +00:00
|
|
|
for ( i = 0; i < actual.length; i++ ) {
|
|
|
|
if ( expected[i] && expected[i].node !== actual[i].node ) {
|
|
|
|
QUnit.push( false, actualSummary, expectedSummary,
|
|
|
|
message + ' (reference equality for selection[' + i + '].node)'
|
|
|
|
);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2012-07-10 19:46:08 +00:00
|
|
|
QUnit.push(
|
|
|
|
QUnit.equiv( actualSummary, expectedSummary ), actualSummary, expectedSummary, message
|
|
|
|
);
|
|
|
|
};
|
|
|
|
|
2012-08-07 01:50:44 +00:00
|
|
|
QUnit.assert.equalDomElement = function ( actual, expected, message ) {
|
2012-07-10 19:46:08 +00:00
|
|
|
var actualSummary = getDomElementSummary( actual ),
|
|
|
|
expectedSummary = getDomElementSummary( expected );
|
2012-10-25 20:06:07 +00:00
|
|
|
|
2012-07-10 19:46:08 +00:00
|
|
|
QUnit.push(
|
|
|
|
QUnit.equiv( actualSummary, expectedSummary ), actualSummary, expectedSummary, message
|
|
|
|
);
|
|
|
|
};
|
|
|
|
|
Kranitor #1: On-boarding
'''Kranitor commits''' are commits by Krinkle with his janitor hat on.
Must never contain functional changes mixed with miscellaneous changes.
.gitignore:
* Add .DS_Store to the ignore list so that browsing the directories
on Mac OS X, will not add these files to the list of untracked
files.
* Fix missing newline at end of file
.jshintrc
* raises -> throws
* +module (QUnit.module)
* remove 'Node' (as of node-jshint 1.7.2 this is now part of
'browser:true', as it should be)
Authors:
* Adding myself
MWExtension/VisualEditor.php
* Fix default value of wgVisualEditorParsoidURL to not
point to the experimental instance in WMF Labs.
Issues:
* ve.ce.TextNode:
- Fix TODO: Don't perform a useless clone of an already-jQuerified object.
- Use .html() to set html content instead of encapsulating between
two strings. This is slightly faster but more importantly safer,
and prevents situations where the resulting jQuery collection
actually contains 2 elements instead of 1, thus messing up
what .contents() is iterating over.
* ve.ce.Document.test.js
- Fix: ReferenceError: assert is not defined
* ve.dm.Document.test.js
- Fix: ReferenceError: assert is not defined
* ve.dm.Transaction.test.js
- Fix: ReferenceError: assert is not defined
* ve.dm.TransactionProcessor.test.js
- Fix: ReferenceError: assert is not defined
* ext.visualEditor.viewPageTarget
- Missing dependency on 'mediawiki.Title'
Code conventions / Misc cleanup
* Various JSHint warnings.
* Whitespace
* jQuery(): Use '<tag>' for element creation,
use '<valid><xml/></valid>' for parsing
* Use the default operator instead of ternary when the condition and
first value are the same.
x = foo ? foo : bar; -> x = foo || bar;
Because contrary to some programming language (PHP...), in JS the
default operator does not enforce a boolean result but returns the
original value, hence it being called the 'default' operator, as
opposed to the 'or' operator.
* No need to call addClass() twice, it takes a space-separated list
(jQuery splits by space and adds if needed)
* Use .on( event[, selector], fn ) instead of the deprecated
routers to it such as .bind(), .delegate() and .live().
All these three are now built-in and fully compatible with .on()
* Add 'XXX:' comments for suspicious code that I don't want to change
as part of a clean up commit.
* Remove unused variables (several var x = this; where x was not
used anywhere, possibly from boilerplate copy/paste)
* Follows-up Trevor's commit that converts test suites to the new
QUnit format. Also removed the globals since we no longer use those
any more.
Change-Id: I7e37c9bff812e371c7f65a6fd85d9e2af3e0a22f
2012-07-27 08:43:33 +00:00
|
|
|
}( QUnit ) );
|