s: %s", error.message);
- return copy.get_inner_text();
- }
-
- // Pad each
with newlines
- for (int i = 0; i < node_list.length; ++i) {
- WebKit.DOM.Node div = node_list.item(i);
- try {
- div.insert_before(doc.create_text_node("\n"), div.first_child);
- div.append_child(doc.create_text_node("\n"));
- } catch (Error error) {
- debug("Error padding
with newlines: %s", error.message);
- }
- }
- return copy.get_inner_text();
- }
// Linkifies plain text links in an HTML document.
public void linkify_document(WebKit.DOM.Document document) {
diff --git a/test/js/composer-page-state-test.vala b/test/js/composer-page-state-test.vala
index fe5f6484..931933a0 100644
--- a/test/js/composer-page-state-test.vala
+++ b/test/js/composer-page-state-test.vala
@@ -11,11 +11,13 @@ class ComposerPageStateTest : ClientWebViewTestCase
{
base("ComposerPageStateTest");
add_test("edit_context_font", edit_context_font);
add_test("edit_context_link", edit_context_link);
+ add_test("contains_attachment_keywords", contains_attachment_keywords);
add_test("get_html", get_html);
add_test("get_text", get_text);
add_test("get_text_with_quote", get_text_with_quote);
add_test("get_text_with_nested_quote", get_text_with_nested_quote);
add_test("resolve_nesting", resolve_nesting);
+ add_test("contains_keywords", contains_keywords);
add_test("quote_lines", quote_lines);
add_test("replace_non_breaking_space", replace_non_breaking_space);
}
@@ -52,6 +54,43 @@ class ComposerPageStateTest : ClientWebViewTestCase {
}
}
+ public void contains_attachment_keywords() {
+ load_body_fixture("""
+inner quote
+
+some text
+
+some text
+
+--
sig
+
+outerquote text
+""");
+ try {
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"geary.containsAttachmentKeyword(\"some\", \"subject text\");"
+ )));
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"geary.containsAttachmentKeyword(\"subject\", \"subject text\");"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"geary.containsAttachmentKeyword(\"innerquote\", \"subject text\");"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"geary.containsAttachmentKeyword(\"sig\", \"subject text\");"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"geary.containsAttachmentKeyword(\"outerquote\", \"subject text\");"
+ )));
+ } catch (Geary.JS.Error err) {
+ print("Geary.JS.Error: %s\n", err.message);
+ assert_not_reached();
+ } catch (Error err) {
+ print("WKError: %s\n", err.message);
+ assert_not_reached();
+ }
+ }
+
public void get_html() {
string html = "
para
";
load_body_fixture(html);
@@ -111,6 +150,59 @@ class ComposerPageStateTest : ClientWebViewTestCase {
}
}
+ public void contains_keywords() {
+ load_body_fixture();
+ string complete_keys = """new Set(["keyword1", "keyword2"])""";
+ string suffix_keys = """new Set(["sf1", "sf2"])""";
+ try {
+ // Doesn't contain
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('notcontained', $complete_keys, $suffix_keys);"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('not contained', $complete_keys, $suffix_keys);"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('not\tcontained', $complete_keys, $suffix_keys);"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('http://www.keyword1.com', $complete_keys, $suffix_keys);"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('http://www.something.com/something.sf1', $complete_keys, $suffix_keys);"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('sf1', $complete_keys, $suffix_keys);"
+ )));
+ assert(!WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('.sf1', $complete_keys, $suffix_keys);"
+ )));
+
+ // Does contain
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('keyword1', $complete_keys, $suffix_keys);"
+ )));
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('keyword2 contained', $complete_keys, $suffix_keys);"
+ )));
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('keyword2\tcontained', $complete_keys, $suffix_keys);"
+ )));
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('something.sf1', $complete_keys, $suffix_keys);"
+ )));
+ assert(WebKitUtil.to_bool(run_javascript(
+ @"ComposerPageState.containsKeywords('something.something.sf2', $complete_keys, $suffix_keys);"
+ )));
+ } catch (Geary.JS.Error err) {
+ print("Geary.JS.Error: %s\n", err.message);
+ assert_not_reached();
+ } catch (Error err) {
+ print("WKError: %s\n", err.message);
+ assert_not_reached();
+ }
+ }
+
public void resolve_nesting() {
load_body_fixture();
unichar q_marker = Geary.RFC822.Utils.QUOTE_MARKER;
diff --git a/ui/composer-web-view.js b/ui/composer-web-view.js
index 026fc210..a1adeae9 100644
--- a/ui/composer-web-view.js
+++ b/ui/composer-web-view.js
@@ -13,9 +13,13 @@ let ComposerPageState = function() {
this.init.apply(this, arguments);
};
ComposerPageState.BODY_ID = "message-body";
+ComposerPageState.KEYWORD_SPLIT_REGEX = /[\s]+/g;
ComposerPageState.QUOTE_START = "";
ComposerPageState.QUOTE_END = "";
ComposerPageState.QUOTE_MARKER = "\x7f";
+// Taken from Geary.HTML.URL_REGEX, without the inline modifier (?x)
+// at the start, which is unsupported in JS
+ComposerPageState.URL_REGEX = new RegExp("\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:'\".,<>?«»“”‘’]))", "i");
ComposerPageState.prototype = {
__proto__: PageState.prototype,
@@ -161,6 +165,76 @@ ComposerPageState.prototype = {
// XXX need mark the quote somehow so we can find it, select
// it and delete it using execCommand
},
+ /**
+ * Determines if subject or body content refers to attachments.
+ */
+ containsAttachmentKeyword: function(keywordSpec, subject) {
+ // XXX this could also use a structured representation of the
+ // message body so we don't need to text to check
+
+ let ATTACHMENT_KEYWORDS_SUFFIX = "doc|pdf|xls|ppt|rtf|pps";
+
+ let completeKeys = new Set(keywordSpec.toLocaleLowerCase().split("|"));
+ let suffixKeys = new Set(ATTACHMENT_KEYWORDS_SUFFIX.split("|"));
+
+ // Check the subject line
+ if (ComposerPageState.containsKeywords(subject, completeKeys, suffixKeys)) {
+ return true;
+ }
+
+ // Check interesting body text
+ let breakingElements = new Set([
+ "BR", "P", "DIV", "BLOCKQUOTE", "TABLE", "OL", "UL", "HR"
+ ]);
+ let content = this.messageBody.firstChild;
+ let found = false;
+ let done = false;
+ let textContent = [];
+ while (content != null && !done) {
+ if (content.nodeType == Node.TEXT_NODE) {
+ textContent.push(content.textContent);
+ } else if (content.nodeType == Node.ELEMENT_NODE) {
+ let isBreaking = breakingElements.has(content.nodeName);
+ if (isBreaking) {
+ textContent.push("\n");
+ }
+
+ // Always exclude quoted text
+ if (content.nodeName != "BLOCKQUOTE") {
+ textContent.push(content.innerText);
+ }
+
+ if (isBreaking || content.nextSibling == null) {
+ for (let line of textContent.join("").split("\n")) {
+ // Ignore everything after a sig or a
+ // forwarded message.
+ // XXX This breaks if the user types this at
+ // the start of a line, also, WK's innerText
+ // impl strips trailing whitespace, so can't
+ // test for 'line == "-- "' :(
+ if (line.startsWith("--")) {
+ done = true;
+ break;
+ }
+
+ line = line.trim();
+ if (line != "") {
+ if (ComposerPageState.containsKeywords(line, completeKeys, suffixKeys)) {
+ found = true;
+ done = true;
+ break;
+ }
+ }
+ }
+ textContent = [];
+ }
+ }
+
+ content = content.nextSibling;
+ }
+
+ return found;
+ },
tabOut: function() {
document.execCommand(
"inserthtml", false, "\t"
@@ -233,6 +307,39 @@ ComposerPageState.prototype = {
}
};
+/**
+ * Determines if any keywords are present in a string.
+ */
+ComposerPageState.containsKeywords = function(line, completeKeys, suffixKeys) {
+ let tokens = new Set(
+ line.toLocaleLowerCase().split(ComposerPageState.KEYWORD_SPLIT_REGEX)
+ );
+
+ for (let key of completeKeys) {
+ if (tokens.has(key)) {
+ return true;
+ }
+ }
+
+ let urlRegex = ComposerPageState.URL_REGEX;
+ // XXX assuming all suffixes have length = 3 here.
+ let extLen = 3;
+ for (let token of tokens) {
+ let extDelim = token.length - (extLen + 1);
+ // We do care about "a.pdf", but not ".pdf"
+ if (token.length >= extLen + 2 && token.charAt(extDelim) == ".") {
+ let suffix = token.substring(extDelim + 1);
+ if (suffixKeys.has(suffix)) {
+ if (token.match(urlRegex) == null) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+};
+
/**
* Convert a HTML DOM tree to plain text with delineated quotes.
*
@@ -405,7 +512,7 @@ let SelectionUtil = {
getCursorElement: function() {
let selection = window.getSelection();
let node = selection.focusNode;
- if (node != null && node.nodeType != Node.ELEMENT_TYPE) {
+ if (node != null && node.nodeType != Node.ELEMENT_NODE) {
node = node.parentNode;
}
return node;