moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

use angular.element instead of jquery for markup clean

This commit is contained in:
Tankred Hase 2013-11-07 14:50:32 +01:00
parent 2b85d823eb
commit 6e144a23e1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/js/controller/write.js
View File

@ -6,7 +6,6 @@ define(function(require) {
aes = require('cryptoLib/aes-cbc'),
util = require('cryptoLib/util'),
str = require('js/app-config').string,
$ = require('jquery'),
emailDao;
//
@ -39,7 +38,7 @@ define(function(require) {
}
function fillFields(re) {
var from, body;
var from, cleaned, body;
if (!re) {
return;
@ -57,7 +56,8 @@ define(function(require) {
// clean text from markup if to prevent injection in contenteditable
if (!re.html) {
body += $('<p>' + re.body + '</p>').text().split('\n').join('<br>');
cleaned = angular.element('<p>' + re.body + '</p>').text();
body += cleaned.split('\n').join('<br>');
$scope.body = body;
}
}
@ -170,7 +170,7 @@ define(function(require) {
var text = body.replace(regex, '').split('<div><br>').join('\n').split('<div>').join('\n').split('<br>').join('\n');
return $('<p>' + text + '</p>').text();
return angular.element('<p>' + text + '</p>').text();
}
//