").addClass(r.classes.dropdown).appendTo("body").hide(),k=(I("
").insertAfter(u).css({position:"absolute",top:-9999,left:-9999,width:"auto",fontSize:u.css("fontSize"),fontFamily:u.css("fontFamily"),fontWeight:u.css("fontWeight"),letterSpacing:u.css("letterSpacing"),whiteSpace:"nowrap"}),d.val(""),r.prePopulate||d.data("pre"));function g(){null!==r.tokenLimit&&s>=r.tokenLimit&&(u.hide(),x())}function m(e){var t=r.tokenFormatter(e),t=I(t).addClass(r.classes.token).insertBefore(h),n=(I("
"+r.deleteText+"").addClass(r.classes.tokenDelete).appendTo(t).click(function(){return C(I(this).parent()),d.change(),!1}),{id:e.id});n[r.propertyToSearch]=e[r.propertyToSearch],I.data(t.get(0),"tokeninput",e),i=i.slice(0,a).concat([n]).concat(i.slice(a)),a++,w(i,d),s+=1,null!==r.tokenLimit&&s>=r.tokenLimit&&(u.hide(),x())}function v(n){var e=r.onAdd;if(!n&&0
]*)("+t+")(?![^<>]*>)(?![^&;]+;)","g"),t.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+n+")(?![^<>]*>)(?![^&;]+;)","gi"),"$1"))}function b(o,e){var i;e&&e.length?(f.empty(),i=I("").appendTo(f).mouseover(function(e){j(I(e.target).closest("li"))}).mousedown(function(e){return v(I(e.target).closest("li").data("tokeninput")),d.change(),!1}).hide(),I.each(e,function(e,t){var n=L(n=r.resultsFormatter(t),t[r.propertyToSearch],o);n=I(n).appendTo(i),e%2?n.addClass(r.classes.dropdownItem):n.addClass(r.classes.dropdownItem2),0===e&&j(n),I.data(n.get(0),"tokeninput",t)}),D(),r.animateDropdown?i.slideDown("fast"):i.show()):r.noResultsText&&(f.html(""+r.noResultsText+"
"),D())}function j(e){e&&(o&&(I(o).removeClass(r.classes.selectedDropdownItem),o=null),e.addClass(r.classes.selectedDropdownItem),o=e.get(0))}function R(){var a=u.val(),l=a.toLowerCase();l&&l.length&&(p&&y(I(p),O),l.length>=r.minChars?(r.searchingText&&(f.html(""+r.searchingText+"
"),D()),clearTimeout(n),n=setTimeout(function(){var n,e,t=l,o=a,i=o+S(),s=c.get(i);s?b(t,s):r.url?(s=S(),n={data:{}},-1n.max_size&&(o={},i=0),o[e]||(i+=1),o[e]=t},this.get=function(e){return o[e]}}}(jQuery);
->>>>>>> upstream/master
+!function(I){var o={method:"GET",contentType:"json",queryParam:"q",searchDelay:300,minChars:1,propertyToSearch:"name",jsonContainer:null,hintText:"Type in a search term",noResultsText:"No results",searchingText:"Searching...",deleteText:"×",animateDropdown:!0,tokenLimit:null,tokenDelimiter:",",preventDuplicates:!1,tokenValue:"id",prePopulate:null,processPrePopulate:!1,idPrefix:"token-input-",resultsFormatter:function(e){return"- "+e[this.propertyToSearch]+"
"},tokenFormatter:function(e){return""+e[this.propertyToSearch]+"
"+r.hintText+"
"),D())}).blur(function(){x(),I(this).val("")}).keydown(function(e){var t,n;switch(e.keyCode){case B:case V:case E:case W:if(I(this).val())return n=null,(n=e.keyCode===W||e.keyCode===V?I(o).next():I(o).prev()).length&&j(n),!1;n=h.prev(),t=h.next(),n.length&&n.get(0)===p||t.length&&t.get(0)===p?e.keyCode===B||e.keyCode===E?y(I(p),P):y(I(p),O):e.keyCode!==B&&e.keyCode!==E||!n.length?e.keyCode!==V&&e.keyCode!==W||!t.length||T(I(t.get(0))):T(I(n.get(0)));break;case z:if(n=h.prev(),!I(this).val().length)return p?(C(I(p)),d.change()):n.length&&T(I(n.get(0))),!1;1===I(this).val().length?x():setTimeout(function(){R()},5);break;case _:case G:case H:return o?(v(I(o).data("tokeninput")),d.change()):v(null),!1;case q:return x(),!0;default:String.fromCharCode(e.which)&&setTimeout(function(){R()},5)}}),d=I(e).hide().val("").focus(function(){u.focus()}).blur(function(){u.blur()}),p=null,a=0,o=null,l=I("").addClass(r.classes.tokenList).click(function(e){var t,e=I(e.target).closest("li");e&&e.get(0)&&I.data(e.get(0),"tokeninput")?(e=e,(t=p)&&y(I(p),A),t===e.get(0)?y(e,A):T(e)):(p&&y(I(p),A),u.focus())}).mouseover(function(e){e=I(e.target).closest("li");e&&p!==this&&e.addClass(r.classes.highlightedToken)}).mouseout(function(e){e=I(e.target).closest("li");e&&p!==this&&e.removeClass(r.classes.highlightedToken)}).insertBefore(d),h=I("").addClass(r.classes.inputToken).appendTo(l).append(u),f=I("").addClass(r.classes.dropdown).appendTo("body").hide(),k=(I("
").insertAfter(u).css({position:"absolute",top:-9999,left:-9999,width:"auto",fontSize:u.css("fontSize"),fontFamily:u.css("fontFamily"),fontWeight:u.css("fontWeight"),letterSpacing:u.css("letterSpacing"),whiteSpace:"nowrap"}),d.val(""),r.prePopulate||d.data("pre"));function g(){null!==r.tokenLimit&&s>=r.tokenLimit&&(u.hide(),x())}function m(e){var t=r.tokenFormatter(e),t=I(t).addClass(r.classes.token).insertBefore(h),n=(I("
"+r.deleteText+"").addClass(r.classes.tokenDelete).appendTo(t).click(function(){return C(I(this).parent()),d.change(),!1}),{id:e.id});n[r.propertyToSearch]=e[r.propertyToSearch],I.data(t.get(0),"tokeninput",e),i=i.slice(0,a).concat([n]).concat(i.slice(a)),a++,w(i,d),s+=1,null!==r.tokenLimit&&s>=r.tokenLimit&&(u.hide(),x())}function v(n){var e=r.onAdd;if(!n&&0
]*)("+t+")(?![^<>]*>)(?![^&;]+;)","g"),t.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+n+")(?![^<>]*>)(?![^&;]+;)","gi"),"$1"))}function b(o,e){var i;e&&e.length?(f.empty(),i=I("").appendTo(f).mouseover(function(e){j(I(e.target).closest("li"))}).mousedown(function(e){return v(I(e.target).closest("li").data("tokeninput")),d.change(),!1}).hide(),I.each(e,function(e,t){var n=L(n=r.resultsFormatter(t),t[r.propertyToSearch],o);n=I(n).appendTo(i),e%2?n.addClass(r.classes.dropdownItem):n.addClass(r.classes.dropdownItem2),0===e&&j(n),I.data(n.get(0),"tokeninput",t)}),D(),r.animateDropdown?i.slideDown("fast"):i.show()):r.noResultsText&&(f.html(""+r.noResultsText+"
"),D())}function j(e){e&&(o&&(I(o).removeClass(r.classes.selectedDropdownItem),o=null),e.addClass(r.classes.selectedDropdownItem),o=e.get(0))}function R(){var a=u.val(),l=a.toLowerCase();l&&l.length&&(p&&y(I(p),O),l.length>=r.minChars?(r.searchingText&&(f.html(""+r.searchingText+"
"),D()),clearTimeout(n),n=setTimeout(function(){var n,e,t=l,o=a,i=o+S(),s=c.get(i);s?b(t,s):r.url?(s=S(),n={data:{}},-1n.max_size&&(o={},i=0),o[e]||(i+=1),o[e]=t},this.get=function(e){return o[e]}}}(jQuery);
\ No newline at end of file
diff --git a/admin/js/typecho.js b/admin/js/typecho.js
index 74bd5010d0..f30eb2f9ac 100644
--- a/admin/js/typecho.js
+++ b/admin/js/typecho.js
@@ -1,5 +1 @@
-<<<<<<< HEAD
-function scrollableEditor(d,h){var t,e=d.css(),n=d.width(),l=null,g=[],c=[],s=500,m=[],o={display:"block",position:"absolute",left:"-99999px",top:"-99999px"},r=$("").appendTo(document.body),u=!1;for(t in e)t.match(/^(direction|font-family|font-size|font-style|font-weight|letter-spacing|line-height|text-align|vertical-align|white-space|word-wrap|word-break|word-spacing)$/i)&&(o[t]=e[t]);function a(e){var t=d.val().split("\n"),n=0;r.width(d.width()),c=[];for(var o=0;o=u[0]&&a[1]<=u[1]){var c=m[l+1]?m[l+1][2]:h.get(0).scrollHeight,s=(0==i?0:u[2])+(c-u[2])*r;p(h,s);break}}}else for(var u,f=0;f=(u=m[f])[0]&&e<=u[1]){(f==m.length-1||u[2]o+h.height())&&h.scrollTop(u[2]);break}}function b(e){var t=$(e),e=t.parent();return 0=i[0]&&o<=i[1]){b(l).removeClass("focus"),b(i[3]).addClass("focus"),l=i[3],r=o;break}}return r}d.on("touch keypress click",v),d.on("focus",function(){u=!0}).on("blur",function(){u=!1,b(l).removeClass("focus")}),d.on("resize",a);var D={editor:[!1,0,i],preview:[!1,0,function(){var e=d.height(),t=(d.innerHeight()-e)/2,n=h.scrollTop(),o=!1;if(!(m.length<=0)){for(var r=0;r').insertAfter(this),r=0,a=s.minHeight,n=this;function i(e){var t=c(e).y,n=o+t;return t<=r&&(n-=5),r=t,n=Math.max(a,n),textarea.height(n+"px"),n |
').insertAfter(t),"tfoot"!=(n=$("tr:last",this)).parent().prop("tagName").toLowerCase()&&(n=(t=$("td",n)).height(),t.height(n-e.outerHeight())))}),l(document).bind("mousemove",l.tableDnD.mousemove).bind("mouseup",l.tableDnD.mouseup),this},makeDraggable:function(t){for(var e=t.rows,n=t.tableDnDConfig,o=0;ol.tableDnD.oldY,l.tableDnD.oldY=r,n.onDragClass?t.addClass(n.onDragClass):t.css(n.onDragStyle),(r=l.tableDnD.findDropTargetRow(t,r))&&(e&&l.tableDnD.dragObject!=r?l.tableDnD.dragObject.parentNode.insertBefore(l.tableDnD.dragObject,r.nextSibling):e||l.tableDnD.dragObject==r||l.tableDnD.dragObject.parentNode.insertBefore(l.tableDnD.dragObject,r))),!1}},findDropTargetRow:function(e,t){for(var n=l.tableDnD.currentTable.rows,o=0;on.length)break}else i[r]===n.charAt(pos)&&r!==g&&(pos++,o=r);return e?u():o+1
|
').insertAfter(t),"tfoot"!=(t=$("tr:last",this)).parent().prop("tagName").toLowerCase())&&(n=(t=$("td",t)).height(),t.height(n-e.outerHeight()))}),l(document).bind("mousemove",l.tableDnD.mousemove).bind("mouseup",l.tableDnD.mouseup),this},makeDraggable:function(t){for(var e=t.rows,n=t.tableDnDConfig,o=0;ol.tableDnD.oldY,l.tableDnD.oldY=o,n.onDragClass?t.addClass(n.onDragClass):t.css(n.onDragStyle),r=l.tableDnD.findDropTargetRow(t,o))&&(e&&l.tableDnD.dragObject!=r?l.tableDnD.dragObject.parentNode.insertBefore(l.tableDnD.dragObject,r.nextSibling):e||l.tableDnD.dragObject==r||l.tableDnD.dragObject.parentNode.insertBefore(l.tableDnD.dragObject,r)),!1},findDropTargetRow:function(e,t){for(var n=l.tableDnD.currentTable.rows,o=0;on.length)break}else s[r]===n.charAt(pos)&&r!==i&&(pos++,o=r);return e?h():o+1>>>>>> upstream/master
+function scrollableEditor(f,d){var t,e=f.css(),n=f.width(),l=null,h=[],c=[],s=500,g=[],o={display:"block",position:"absolute",left:"-99999px",top:"-99999px"},i=$("").appendTo(document.body),u=!1;for(t in e)t.match(/^(direction|font-family|font-size|font-style|font-weight|letter-spacing|line-height|text-align|vertical-align|white-space|word-wrap|word-break|word-spacing)$/i)&&(o[t]=e[t]);function r(e){var t=f.val().split("\n"),n=0;i.width(f.width()),c=[];for(var r,o,a=0;a=(s=g[i])[0]&&e<=s[1]){(i==g.length-1||s[2]o+d.height())&&d.scrollTop(s[2]);break}}else{for(var l=0;l=s[0]&&a[1]<=s[1]){var u=g[c+1]?g[c+1][2]:d.get(0).scrollHeight,u=(0==l?0:s[2])+(u-s[2])*r;p(d,u);break}}}}function v(e){var e=$(e),t=e.parent();return 0=i[0]&&o<=i[1]){v(l).removeClass("focus"),v(i[3]).addClass("focus"),l=i[3],r=o;break}}}return r}f.on("touch keypress click",D),f.on("focus",function(){u=!0}).on("blur",function(){u=!1,v(l).removeClass("focus")}),f.on("resize",r);var a={editor:[!1,0,b],preview:[!1,0,function(){var e=f.height(),e=(f.innerHeight()-e)/2,t=d.scrollTop(),n=!1;if(!(g.length<=0)){for(var o=0;o').insertAfter(this),r=0,a=s.minHeight,n=this;function i(e){var t=c(e).y,n=o+t;return t<=r&&(n-=5),r=t,n=Math.max(a,n),textarea.height(n+"px"),n |
').insertAfter(t),"tfoot"!=(t=$("tr:last",this)).parent().prop("tagName").toLowerCase())&&(n=(t=$("td",t)).height(),t.height(n-e.outerHeight()))}),l(document).bind("mousemove",l.tableDnD.mousemove).bind("mouseup",l.tableDnD.mouseup),this},makeDraggable:function(t){for(var e=t.rows,n=t.tableDnDConfig,o=0;ol.tableDnD.oldY,l.tableDnD.oldY=o,n.onDragClass?t.addClass(n.onDragClass):t.css(n.onDragStyle),r=l.tableDnD.findDropTargetRow(t,o))&&(e&&l.tableDnD.dragObject!=r?l.tableDnD.dragObject.parentNode.insertBefore(l.tableDnD.dragObject,r.nextSibling):e||l.tableDnD.dragObject==r||l.tableDnD.dragObject.parentNode.insertBefore(l.tableDnD.dragObject,r)),!1},findDropTargetRow:function(e,t){for(var n=l.tableDnD.currentTable.rows,o=0;on.length)break}else s[r]===n.charAt(pos)&&r!==i&&(pos++,o=r);return e?h():o+1