Pārlūkot izejas kodu

Merge branch 'develop'

version-14
Pratik Vyas pirms 11 gadiem
vecāks
revīzija
dd52519855
2 mainītis faili ar 2 papildinājumiem un 2 dzēšanām
  1. +1
    -1
      config.json
  2. +1
    -1
      public/js/wn/ui/editor.js

+ 1
- 1
config.json Parādīt failu

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


+ 1
- 1
public/js/wn/ui/editor.js Parādīt failu

@@ -125,7 +125,7 @@ bsEditor = Class.extend({
clean_html: function() { clean_html: function() {
var html = this.editor.html() || ""; 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;)*$/, ''); // html = html.replace(/(<br>|\s|<div><br><\/div>|&nbsp;)*$/, '');


// remove custom typography (use CSS!) // remove custom typography (use CSS!)


Notiek ielāde…
Atcelt
Saglabāt