Merge "Restore papaparse"

This commit is contained in:
jenkins-bot 2014-12-09 19:02:06 +00:00 committed by Gerrit Code Review
commit d318c5cded

View file

@ -571,8 +571,7 @@ $wgResourceModules += array(
'lib/ve/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js',
'lib/ve/src/ui/dialogs/ve.ui.ProgressDialog.js',
// FIXME disabled because papaparse is broken (T75896)
//'lib/ve/src/ui/filedrophandlers/ve.ui.DSVFileDropHandler.js',
'lib/ve/src/ui/filedrophandlers/ve.ui.DSVFileDropHandler.js',
'lib/ve/src/ui/filedrophandlers/ve.ui.PlainTextFileDropHandler.js',
'lib/ve/src/ui/filedrophandlers/ve.ui.HTMLFileDropHandler.js',
@ -648,8 +647,7 @@ $wgResourceModules += array(
),
'dependencies' => array(
'unicodejs',
// FIXME papaparse is broken (T75896)
//'papaparse',
'papaparse',
'jquery.uls.data',
'ext.visualEditor.base',
),