http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94920
Revision: 94920
Author: tparscal
Date: 2011-08-18 18:55:16 +0000 (Thu, 18 Aug 2011)
Log Message:
-----------
Simplified annotation comparison
Modified Paths:
--------------
trunk/parsers/wikidom/lib/es/es.Transaction.js
Modified: trunk/parsers/wikidom/lib/es/es.Transaction.js
===================================================================
--- trunk/parsers/wikidom/lib/es/es.Transaction.js 2011-08-18 18:52:54 UTC
(rev 94919)
+++ trunk/parsers/wikidom/lib/es/es.Transaction.js 2011-08-18 18:55:16 UTC
(rev 94920)
@@ -80,22 +80,13 @@
} else {
throw 'Annotation method error. Unsupported annotation
method: ' + val.method;
}
+ // Find the index of a comparable annotation (checking for same
value, not reference)
var index;
for ( var i = 0; i < stack.length; i++ ) {
- // Type check
- if ( stack[i].type !== val.annotation.type ) {
- // Nope
- continue;
+ if ( es.Content.compareObjects( stack[i],
val.annotation ) ) {
+ index = i;
+ break;
}
- // Data check
- if ( ( stack[i].data || stack[i].data )
- && !es.Content.compareObjects(
stack[i], val.annotation ) ) {
- // Nope
- continue;
- }
- // Found it!
- index = i;
- break;
}
if ( index === undefined ) {
throw 'Annotation stack error. Annotation is missing.';
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
