From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 16 Nov 2013 11:56:58 +0000 (+0000)
Subject: Merge "Deprecate addButton and insertTags in mediawiki.action.edit"
X-Git-Tag: 1.31.0-rc.0~18103
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=1a8175ed1ca611a67b1eee4e170312a3a4f7f217;p=lhc%2Fweb%2Fwiklou.git

Merge "Deprecate addButton and insertTags in mediawiki.action.edit"
---

1a8175ed1ca611a67b1eee4e170312a3a4f7f217
diff --cc resources/mediawiki.action/mediawiki.action.edit.js
index ec923dde99,4639aeef1f..299fabdc95
--- a/resources/mediawiki.action/mediawiki.action.edit.js
+++ b/resources/mediawiki.action/mediawiki.action.edit.js
@@@ -130,10 -130,10 +130,10 @@@
  	};
  
  	// Legacy (for compatibility with the code previously in skins/common.edit.js)
- 	window.addButton = toolbar.addButton;
- 	window.insertTags = toolbar.insertTags;
+ 	mw.log.deprecate( window, 'addButton', toolbar.addButton, 'Use mw.toolbar.addButton instead' );
+ 	mw.log.deprecate( window, 'insertTags', toolbar.insertTags, 'Use mw.toolbar.insertTags instead' );
  
 -	// Explose API publicly
 +	// Expose API publicly
  	mw.toolbar = toolbar;
  
  	$( function () {