by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
by zhanyi
Merge branch 'master' into dev-1.2.6

Conflicts:
	CHANGELOG.TXT
	_examples/completeDemo.html
	_examples/customPluginDemo.html
	_examples/customToolbarDemo.html
	_examples/editor_api.js
	_examples/filterRuleDemo.html
	_examples/highlightDemo.html
	_examples/index.html
	_examples/jqueryCompleteDemo.html
	_examples/multiDemo.html
	_examples/renderInTable.html
	_examples/resetDemo.html
	_examples/setWidthHeightDemo.html
	_examples/simpleDemo.html
	_examples/submitFormDemo.html
	_examples/textareaDemo.html
	_examples/uparsedemo.html
	_src/commands.js
	_src/core/Editor.js
	_src/core/EventBase.js
	_src/core/Range.js
	_src/core/Selection.js
	_src/core/domUtils.js
	_src/core/dtd.js
	_src/core/filternode.js
	_src/core/filterword.js
	_src/core/htmlparser.js
	_src/core/node.js
	_src/core/utils.js
	_src/editor.js
	_src/plugins/anchor.js
	_src/plugins/autofloat.js
	_src/plugins/autoheight.js
	_src/plugins/autolink.js
	_src/plugins/autosubmit.js
	_src/plugins/autotypeset.js
	_src/plugins/background.js
	_src/plugins/basestyle.js
	_src/plugins/blockquote.js
	_src/plugins/catchremoteimage.js
	_src/plugins/cleardoc.js
	_src/plugins/contextmenu.js
	_src/plugins/convertcase.js
	_src/plugins/customstyle.js
	_src/plugins/defaultfilter.js
	_src/plugins/directionality.js
	_src/plugins/dragdrop.js
	_src/plugins/elementpath.js
	_src/plugins/enterkey.js
	_src/plugins/font.js
	_src/plugins/highlightcode.js
	_src/plugins/horizontal.js
	_src/plugins/indent.js
	_src/plugins/insertcode.js
	_src/plugins/inserthtml.js
	_src/plugins/insertparagraph.js
	_src/plugins/justify.js
	_src/plugins/keystrokes.js
	_src/plugins/lineheight.js
	_src/plugins/link.js
	_src/plugins/list.js
	_src/plugins/music.js
	_src/plugins/pagebreak.js
	_src/plugins/paragraph.js
	_src/plugins/preview.js
	_src/plugins/puretxtpaste.js
	_src/plugins/removeformat.js
	_src/plugins/rowspacing.js
	_src/plugins/scrawl.js
	_src/plugins/searchreplace.js
	_src/plugins/selectall.js
	_src/plugins/snapscreen.js
	_src/plugins/source.js
	_src/plugins/table.action.js
	_src/plugins/table.cmds.js
	_src/plugins/table.core.js
	_src/plugins/template.js
	_src/plugins/time.js
	_src/plugins/undo.js
	_src/plugins/video.js
	_src/plugins/webapp.js
	_src/plugins/wordcount.js
	_src/plugins/wordimage.js
	_src/ui/autotypesetbutton.js
	_src/ui/autotypesetpicker.js
	_src/ui/cellalignpicker.js
	_src/ui/colorbutton.js
	_src/ui/colorpicker.js
	_src/ui/dialog.js
	_src/ui/editor.js
	_src/ui/editorui.js
	_src/ui/menu.js
	_src/ui/pastepicker.js
	_src/ui/popup.js
	_src/ui/stateful.js
	_src/ui/tablebutton.js
	_src/ui/tablepicker.js
	_src/ui/uiutils.js
	_test/core/Editor.js
	_test/core/EventBase.js
	_test/core/Range.js
	_test/core/Selection.js
	_test/core/ajax.js
	_test/core/ajax.php
	_test/core/browser.js
	_test/core/domUtils.js
	_test/core/filternode.js
	_test/core/filterword.js
	_test/core/htmlparser.js
	_test/core/node.js
	_test/core/tools.js
	_test/core/utils.js
	_test/editor_config.js
	_test/editor_config_src.js
	_test/import.js
	_test/index.php
	_test/plugins/anchor.js
	_test/plugins/auto.js
	_test/plugins/autofloat.js
	_test/plugins/autoheight.js
	_test/plugins/autolink.js
	_test/plugins/autotypeset.js
	_test/plugins/background.js
	_test/plugins/basestyle.js
	_test/plugins/blockquote.js
	_test/plugins/catchremoteimage.js
	_test/plugins/cleardoc.js
	_test/plugins/contextmenu.js
	_test/plugins/convertcase.js
	_test/plugins/customstyle.js
	_test/plugins/defaultfilter.js
	_test/plugins/directionality.js
	_test/plugins/dragdrop.js
	_test/plugins/elementpath.js
	_test/plugins/enterkey.js
	_test/plugins/fiximgclick.js
	_test/plugins/font.js
	_test/plugins/formatmatch.js
	_test/plugins/horizontal.js
	_test/plugins/iframe.js
	_test/plugins/image.js
	_test/plugins/indent.js
	_test/plugins/inserthtml.js
	_test/plugins/insertparagraph.js
	_test/plugins/justify.js
	_test/plugins/keystrokes.js
	_test/plugins/lineheight.js
	_test/plugins/link.js
	_test/plugins/list.js
	_test/plugins/music.js
	_test/plugins/pagebreak.js
	_test/plugins/paragraph.js
	_test/plugins/paste.js
	_test/plugins/preview.js
	_test/plugins/print.js
	_test/plugins/removeformat.js
	_test/plugins/rowspacing.js
	_test/plugins/scrawl.js
	_test/plugins/searchreplace.js
	_test/plugins/selectall.js
	_test/plugins/shortcutkeys.js
	_test/plugins/snapscreen.js
	_test/plugins/source.js
	_test/plugins/table.action.js
	_test/plugins/table.cmds.js
	_test/plugins/table.core.js
	_test/plugins/template.js
	_test/plugins/time.js
	_test/plugins/tools.js
	_test/plugins/undo.js
	_test/plugins/webapp.js
	_test/plugins/wordcount.js
	_test/plugins/wordimage.js
	_test/qunit/jquery-1.5.1.js
	_test/qunit/qunit.css
	_test/qunit/qunit.js
	_test/qunit/tools.js
	_test/testDesign/Internationalization.xmind
	_test/testDesign/Manual regression cases.xmind
	_test/testDesign/Range.mm
	_test/testDesign/attachment.xmind
	_test/testDesign/autotypeset.xmind
	_test/testDesign/config.xmind
	_test/testDesign/convertcase.xmind
	_test/testDesign/core.xmind
	_test/testDesign/customdownload.xmind
	_test/testDesign/customstyle.xmind
	_test/testDesign/domUtils.xmind
	_test/testDesign/image revelant.xmind
	_test/testDesign/interlacetable.xmind
	_test/testDesign/lineheight.xmind
	_test/testDesign/offical site.xmind
	_test/testDesign/regression testing.xmind
	_test/testDesign/shortcutkeys.mm
	_test/testDesign/sorttable.xmind
	_test/testDesign/table drag.xmind
	_test/testDesign/template.xmind
	_test/testDesign/test case.xmind
	_test/testDesign/test design.xmind
	_test/testDesign/test list for 1.2.5.xmind
	_test/testDesign/test list for 1.2.6.xmind
	_test/testDesign/ueditor 1.2.1.xmind
	_test/testDesign/ueditor 1.2.3.xmind
	_test/testDesign/ueditor 1.2.4 test design.docx
	_test/testDesign/ueditor 1.2.4 test list.xmind
	_test/testDesign/ueditor 1.2.5 test design.docx
	_test/testDesign/ueditor 1.2.6 test design.docx
	_test/testDesign/wordimage.xmind
	_test/testDesign/wordpress integrate.xmind
	_test/tools/br/analysis.php
	_test/tools/br/batchrun.sh
	_test/tools/br/case.class.php
	_test/tools/br/config.php
	_test/tools/br/coverage/jscov.php
	_test/tools/br/coverage/jscoverage-highlight.css
	_test/tools/br/coverage/jscoverage-ie.css
	_test/tools/br/coverage/jscoverage-throbber.gif
	_test/tools/br/coverage/jscoverage.css
	_test/tools/br/coverage/jscoverage.html
	_test/tools/br/coverage/jscoverage.js
	_test/tools/br/coverage/readCoverage.js
	_test/tools/br/css/bg_button_a.gif
	_test/tools/br/css/bg_button_span.gif
	_test/tools/br/css/qunit.css
	_test/tools/br/css/tangramtest.css
	_test/tools/br/css/testsuite.css
	_test/tools/br/filehelper.php
	_test/tools/br/geneHTML.php
	_test/tools/br/geneHistory.php
	_test/tools/br/geneXML.php
	_test/tools/br/import.php
	_test/tools/br/js/UserAction manual.rar
	_test/tools/br/js/UserAction.js
	_test/tools/br/js/ext_qunit.js
	_test/tools/br/js/jquery-1.5.1.js
	_test/tools/br/js/run.js
	_test/tools/br/js/tangram.js
	_test/tools/br/js/testrunner.js
	_test/tools/br/js/tools.js
	_test/tools/br/jshintReport.html
	_test/tools/br/lib/Staf.php
	_test/tools/br/lib/StafResult.php
	_test/tools/br/list.php
	_test/tools/br/log.php
	_test/tools/br/mail.php
	_test/tools/br/read.php
	_test/tools/br/record.php
	_test/tools/br/report.php
	_test/tools/br/run.php
	_test/tools/br/runall.php
	_test/tools/br/txt/test1_1.txt
	_test/tools/br/txt/test1_2.txt
	_test/tools/br/txt/test1_3.txt
	_test/tools/br/txt/test2_1.txt
	_test/tools/br/txt/test2_2.txt
	_test/tools/br/txt/test2_3.txt
	_test/tools/br/txt/test3_1.txt
	_test/tools/coverage/cov.bat
	_test/tools/coverage/jscoverage.exe
	_test/tools/data/frame.html
	_test/tools/data/frame.php
	_test/tools/data/test.JPG
	_test/tools/data/test.html
	_test/tools/data/testReady.html
	_test/tools/lib/ant_tangram_ext.jar
	_test/tools/lib/js.jar
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/conf/check.cfg
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/conf/custcheck.conf
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/conf/ignore.list
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/conf/omitfiles.conf
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/core/customcheck/cust.sh
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/core/jshint/js.jar
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/core/jshint/jshint-rhino.js
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/core/tpl/htmlpart.html
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/core/tpl/toggle_tpl.html
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/editor.js
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/hint.py
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/jshint.js
	_test/tools/lib/jshunter_1.2.0.1/jshunter_dev/jshunter/version
	_test/tools/lib/jslint4java-2.0.2.jar
	_test/tools/lib/jslint4java-ant-1.4.2.jar
	_test/tools/lib/npPlugintest.dll
	_test/ui/autotypesetbutton.js
	_test/ui/button.js
	_test/ui/colorbutton.js
	_test/ui/combox.js
	_test/ui/css/DEFAULT.css
	_test/ui/editor.js
	_test/ui/editorui.js
	_test/ui/mask.js
	_test/ui/menu.js
	_test/ui/menubutton.js
	_test/ui/popup.js
	_test/ui/separator.js
	_test/ui/splitbutton.js
	_test/ui/stateful.js
	_test/ui/tablebutton.js
	_test/ui/toolbar.js
	_test/ui/tools.js
	_test/ui/uibase.js
	_test/ui/uiutils.js
	_test/关键字.txt
	dialogs/attachment/attachment.html
	dialogs/background/background.js
	dialogs/emotion/emotion.css
	dialogs/emotion/emotion.js
	dialogs/help/help.html
	dialogs/help/help.js
	dialogs/image/image.css
	dialogs/image/image.html
	dialogs/image/image.js
	dialogs/insertframe/insertframe.html
	dialogs/internal.js
	dialogs/link/link.html
	dialogs/music/music.js
	dialogs/scrawl/scrawl.js
	dialogs/searchreplace/searchreplace.js
	dialogs/snapscreen/snapscreen.html
	dialogs/table/dragicon.png
	dialogs/table/edittable.css
	dialogs/table/edittable.html
	dialogs/table/edittable.js
	dialogs/table/edittip.html
	dialogs/tangram.js
	dialogs/template/config.js
	dialogs/video/video.html
	dialogs/video/video.js
	dialogs/wordimage/wordimage.js
	jsp/getContent.jsp
	lang/en/en.js
	lang/zh-cn/zh-cn.js
	makefile.config
	makefile.js
	net/Web.config
	net/getContent.ashx
	net/imageManager.ashx
	net/imageUp.ashx
	php/getContent.php
	php/imageManager.php
	php/imageUp.php
	themes/default/_css/button.css
	themes/default/_css/buttonicon.css
	themes/default/_css/cellalignpicker.css
	themes/default/_css/colorpicker.css
	themes/default/_css/combox.css
	themes/default/_css/dialog.css
	themes/default/_css/editor.css
	themes/default/_css/menu.css
	themes/default/_css/menubutton.css
	themes/default/_css/multiMenu.css
	themes/default/_css/pastepicker.css
	themes/default/_css/popup.css
	themes/default/_css/splitbutton.css
	themes/default/_css/tablepicker.css
	themes/default/_css/ueditor.css
	themes/default/images/arrow_down.png
	themes/default/images/arrow_up.png
	themes/default/images/cursor_h.png
	themes/default/images/cursor_v.png
	themes/default/images/table-cell-align.png
	themes/default/images/tangram-colorpicker.png
	themes/default/images/wordpaste.png
	ueditor.config.js
	ueditor.parse.js
by zhanyi