diff --git a/Linux/Windows.py b/Linux/Windows.py index 096e18d..338416b 100644 --- a/Linux/Windows.py +++ b/Linux/Windows.py @@ -338,8 +338,9 @@ class NewPost(Helper.RestorableWindow): self.textInput.setPlainText(string) cursor = self.textInput.textCursor() - cursor.movePosition(QtGui.QTextCursor.NextWord, QtGui.QTextCursor.MoveAnchor) - cursor.movePosition(QtGui.QTextCursor.NextWord, QtGui.QTextCursor.MoveAnchor) + cursor.movePosition(QtGui.QTextCursor.End, QtGui.QTextCursor.MoveAnchor) + cursor.movePosition(QtGui.QTextCursor.Start, QtGui.QTextCursor.KeepAnchor) + cursor.movePosition(QtGui.QTextCursor.EndOfLine, QtGui.QTextCursor.KeepAnchor) self.textInput.setTextCursor(cursor) def onChanged(self): diff --git a/WebKit/scripts/controller/Profile.js b/WebKit/scripts/controller/Profile.js index 4eb1d04..40f3ad8 100644 --- a/WebKit/scripts/controller/Profile.js +++ b/WebKit/scripts/controller/Profile.js @@ -453,6 +453,7 @@ function(HostApp, Core, Paths, URI) { this.setFollowingButton(true); var url = URI(Paths.mkApiRootPath("/followings")); var data = JSON.stringify({"entity": this.entity }); + debug(data) Paths.getURL(url.toString(), "POST", function(resp) { if (resp.status >= 200 && resp.status < 300) { _this.following_id = JSON.parse(resp.responseText).id diff --git a/WebKit/scripts/helper/Core.js b/WebKit/scripts/helper/Core.js index 40c7b6f..392812b 100644 --- a/WebKit/scripts/helper/Core.js +++ b/WebKit/scripts/helper/Core.js @@ -643,7 +643,7 @@ function(jQuery, Paths, URI, HostApp, Cache) { var text = node.innerHTML; var mentions_in_text = []; - var res = text.match(/(\^[\w:/.]+(?:[\w]))/ig); + var res = text.match(/(\^[\w:/.-]+(?:[\w]))/ig); if (res) { for (var i = 0; i < res.length; i++) { @@ -740,7 +740,7 @@ function(jQuery, Paths, URI, HostApp, Cache) { }) } - var res = text.match(/(\^[\w:/]+\.[\w:/.]+(?:[\w]))/ig); + var res = text.match(/(\^[\w:/]+\.[\w:/.-]+(?:[\w]))/ig); if (res) { for (var i = 0; i < res.length; i++) { @@ -868,7 +868,7 @@ function(jQuery, Paths, URI, HostApp, Cache) { if(mentions.length > 0) string += "\n\n/cc "; for (var i = 0; i < mentions.length; i++) { var e = mentions[i].entity.replace("https://", ""); - if(string.indexOf(e) == -1) string += "^" + e + " "; + if(string.indexOf(e) == -1) string += "^" + e; } HostApp.openNewMessageWidow(entity, status_id, string, is_private);