wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-27 04:06:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bunch of fixes for IE8

Browse source
This commit is contained in:
Inez Korczynski 2011-12-05 21:37:38 +00:00
parent 7cf6990af3
commit 8ec3fb5b81
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/es/models/es.DocumentModel.js
View file

@ -84,7 +84,7 @@ es.DocumentModel.createNodesFromData = function( data ) {
// It's an element, figure out it's type // It's an element, figure out it's type
var element = data[i], var element = data[i],
type = element.type, type = element.type,
open = type[0] !== '/'; open = type.charAt( 0 ) !== '/';
// Trim the "/" off the beginning of closing tag types // Trim the "/" off the beginning of closing tag types
if ( !open ) { if ( !open ) {
type = type.substr( 1 ); type = type.substr( 1 );
@ -148,7 +148,7 @@ es.DocumentModel.newFromPlainObject = function( obj ) {
* @param {Object} annotation Annotation object to generate hash for * @param {Object} annotation Annotation object to generate hash for
* @returns {String} Hash of annotation * @returns {String} Hash of annotation
*/ */
es.DocumentModel.getHash = typeof JSON.stringify === 'function' ? es.DocumentModel.getHash = ( window.JSON && typeof JSON.stringify === 'function' ) ?
JSON.stringify : es.JsonSerializer.stringify; JSON.stringify : es.JsonSerializer.stringify;
/** /**

10
modules/es/views/es.ContentView.js
View file

@ -878,6 +878,7 @@ es.ContentView.prototype.getHtml = function( range, options ) {
leftPlain, leftPlain,
rightPlain, rightPlain,
stack = [], stack = [],
chr,
i, i,
j; j;
for ( i = 0; i < data.length; i++ ) { for ( i = 0; i < data.length; i++ ) {
@ -897,18 +898,19 @@ es.ContentView.prototype.getHtml = function( range, options ) {
} else if ( !leftPlain && !rightPlain ) { } else if ( !leftPlain && !rightPlain ) {
// [formatted][formatted] pair, open/close any differences // [formatted][formatted] pair, open/close any differences
for ( j = 1; j < left.length; j++ ) { for ( j = 1; j < left.length; j++ ) {
if ( right.indexOf( left[j] ) === -1 ) { if ( es.inArray( left[j], right ) ) {
out += render( 'close', left[j], stack ); out += render( 'close', left[j], stack );
} }
} }
for ( j = 1; j < right.length; j++ ) { for ( j = 1; j < right.length; j++ ) {
if ( left.indexOf( right[j] ) === -1 ) { if ( es.inArray( right[j], left ) ) {
out += render( 'open', right[j], stack ); out += render( 'open', right[j], stack );
} }
} }
} }
out += right[0] in htmlChars ? htmlChars[right[0]] : right[0]; chr = rightPlain ? right : right[0];
left = right; out += chr in htmlChars ? htmlChars[chr] : chr;
left = right;
} }
// Close all remaining tags at the end of the content // Close all remaining tags at the end of the content
if ( !rightPlain && right ) { if ( !rightPlain && right ) {