jeena/Bungloo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

fixed problems with mentions

Browse source
This commit is contained in:
jeena 2013-07-25 16:27:55 +02:00
parent 0bf0324702
commit 1c12e5b375
4 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

24
WebKit/scripts/helper/Core.js
View file

@ -3,16 +3,14 @@ define([
"helper/APICalls",
"lib/URI",
"helper/HostApp",
"lib/Showdown",
"lib/Timeago",
"lib/SingleDoubleClick"
],
function(jQuery, APICalls, URI, HostApp, Showdown) {
function(jQuery, APICalls, URI, HostApp) {
function Core() {
this.saveScrollTop = 0;
this.markdown = new Showdown.converter();
}
@ -669,13 +667,13 @@ function(jQuery, APICalls, URI, HostApp, Showdown) {
Core.prototype.replaceURLWithHTMLLinks = function(text, entities, message_node) {
// FIXME: this has to be done better so one can nest that stuff and escape with \
return text.replace(/_([^_]+)_/g, "<em>$1</em> ")
.replace(/\*([^\*]+)\*/g, "<strong>$1</strong> ")
.replace(/`([^`]+)`/g, "<code>$1</code> ")
.replace(/~([^~]+)~/g, "<del>$1</del> ")
.replace(/\#[^\s]+/, "<a href='javascript:controller.search(\'$1\')'>#$1</a>")
.replace(/[^\^]\[([^\]]+)\]\(([^\)]+)\)/g, "<a href='$2'>$1</a> ")
.replace(/\^\[([^\]]+)\]\(([^\)]+)\)/g, "<a class='name' href='javascript:controller.showEntity(this, $2);'>$1</a> ");
return text.replace(/_([^_]+)_/g, "<em>$1</em>")
.replace(/\*([^\*]+)\*/g, "<strong>$1</strong>")
.replace(/`([^`]+)`/g, "<code>$1</code>")
.replace(/~([^~]+)~/g, "<del>$1</del>")
.replace(/\#([^\s]+)/g, "<a class='hash' href=\"javascript:bungloo.search.searchFor('$1')\">#$1</a>")
.replace(/(^|[^\^])\[([^\]]+)\]\(([^\)]+)\)/g, "<a class='link' href='javascript:controller.openURL(\"$3\");'>$2</a>")
.replace(/\^\[([^\]]+)\]\(([^\)]+)\)/g, "<a class='name' href='#' onclick='bungloo.entityProfile.showEntity(this, $2); return false;'>$1</a>");
}
Core.prototype.parseForMedia = function(text, images) {
@ -849,17 +847,19 @@ function(jQuery, APICalls, URI, HostApp, Showdown) {
Core.prototype.afterChangingTextinMessageHTML = function(message_node) {
// adding show search on click hash
/*
$(message_node).find("a.hash").click(function(e) {
if(bungloo.search) bungloo.search.searchFor(e.target.innerHTML);
return false;
});
*/
// adding show profile on click
/*
$(message_node).find("a.name").click(function(e) {
HostApp.showProfileForEntity(e.target.title);
return false;
});
});*/
}