Merge pull request #1 from li-xiaojun/master#1220

YXHTom wants to merge 2 commits intojunixapp:masterjunixapp/XPopup:masterfrom

YXHTom:masterYXHTom/XPopup:masterCopy head branch name to clipboard