补充关键字
Merge branch 'dev-1.2.6' of http://github.com/campaign/ueditor into dev-1.2.6