Skip to content

Commit d93da2b

Browse files
committed
Simplify mime-reformatting code.
1 parent fd5f591 commit d93da2b

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

src/gmail.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,26 +1910,19 @@ var Gmail_ = function(localJQuery) {
19101910
return url;
19111911
};
19121912

1913-
api.tools.reformat_source = function(responseText, callback) {
1914-
var result = null;
1913+
api.tools.reformat_source = function(responseText) {
19151914
try {
19161915
// if parsing suceeds, its a HTML-embedded MIME-message
19171916
var parser = new DOMParser();
19181917
var doc = parser.parseFromString(responseText, "text/html");
19191918
var elem = doc.getElementById("raw_message_text");
19201919
var source = elem.innerHTML;
1921-
result = source;
1920+
return source;
19221921
}
19231922
catch (err) {
19241923
// if parsing fails, its a raw mime message
19251924
}
1926-
result = result || responseText;
1927-
1928-
if (callback) {
1929-
callback(result);
1930-
} else {
1931-
return result;
1932-
}
1925+
return responseText;
19331926
};
19341927

19351928
api.get.email_source = function(email_id) {
@@ -1947,7 +1940,7 @@ var Gmail_ = function(localJQuery) {
19471940
var url = api.helper.get.email_source_pre(email_id);
19481941
if (url != null) {
19491942
api.tools.make_request_async(url, 'GET', function(value) {
1950-
api.tools.reformat_source(value, callback);
1943+
callback(api.tools.reformat_source(value));
19511944
});
19521945
} else {
19531946
callback('');

0 commit comments

Comments
 (0)