From 5b804df40f52f00136e83431f207d2d70e64304c Mon Sep 17 00:00:00 2001 From: Catrope Date: Mon, 13 Aug 2012 18:02:40 -0700 Subject: [PATCH] SimpleWikiLink is no longer used by Parsoid, remove it from VE Change-Id: I7f19304dc8bd6819992756a704e215d31f8b2e7e --- modules/ve/ce/nodes/ve.ce.TextNode.js | 6 ------ modules/ve/dm/annotations/ve.dm.LinkAnnotation.js | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/ve/ce/nodes/ve.ce.TextNode.js b/modules/ve/ce/nodes/ve.ce.TextNode.js index 313b7ef5b7..c4288d9d09 100644 --- a/modules/ve/ce/nodes/ve.ce.TextNode.js +++ b/modules/ve/ce/nodes/ve.ce.TextNode.js @@ -132,12 +132,6 @@ ve.ce.TextNode.annotationRenderers = { }, 'close': '' }, - 'link/SimpleWikiLink': { - 'open': function () { - return ''; - }, - 'close': '' - }, 'link/unknown': { 'open': function () { return ''; diff --git a/modules/ve/dm/annotations/ve.dm.LinkAnnotation.js b/modules/ve/dm/annotations/ve.dm.LinkAnnotation.js index 75fb22004f..b61c1d2ebb 100644 --- a/modules/ve/dm/annotations/ve.dm.LinkAnnotation.js +++ b/modules/ve/dm/annotations/ve.dm.LinkAnnotation.js @@ -38,7 +38,7 @@ ve.dm.LinkAnnotation.converters = { } link.setAttribute( 'rel', 'mw:' + subType ); - if ( subType === 'WikiLink' || subType === 'SimpleWikiLink') { + if ( subType === 'WikiLink' ) { // Set href to /title // FIXME article path should be configurable, currently Parsoid always uses '/' // FIXME space -> _ is MW-specific @@ -58,7 +58,7 @@ ve.dm.LinkAnnotation.converters = { 'data': {} }, i, attribute; - if ( subType === 'WikiLink' || subType === 'SimpleWikiLink' ) { + if ( subType === 'WikiLink' ) { // Get title from href by stripping article path // FIXME article path should be configurable, currently Parsoid always uses '/' // FIXME _ -> space is MW-specific