vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop'

Browse source
This commit is contained in:
Pratik Vyas 2014-02-14 10:35:51 +05:30
commit dd52519855
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.json
View file

@ -1,6 +1,6 @@
{
"base_template": "lib/website/templates/base.html",
"framework_version": "3.9.4",
"framework_version": "3.9.5",
"modules": {
"Calendar": {
"color": "#2980b9",

2
public/js/wn/ui/editor.js
View file

@ -125,7 +125,7 @@ bsEditor = Class.extend({
clean_html: function() {
var html = this.editor.html() || "";
if(!strip(this.editor.text()) && !(this.editor.find("img"))) html = "";
if(!$.trim(this.editor.text()) && !(this.editor.find("img"))) html = "";
// html = html.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/, '');
// remove custom typography (use CSS!)