lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-27 04:19:04 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.9-int' into 1.x

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-04-21 15:00:42 +02:00
parent 7c0f4500eb 5d7988650e
commit 5dabbf7aec
14 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
View File

@@ -929,6 +929,7 @@ var LayoutEditor;
this.contentTypeClass = contentTypeClass;
this.html = html;
this.hasEditor = hasEditor;
this.isContainable = true;
this.getInnerText = function () {
return $($.parseHTML("<div>" + this.html + "</div>")).text();

2
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js vendored
View File

File diff suppressed because one or more lines are too long

1
src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models/Html.js
View File

@@ -9,6 +9,7 @@
this.contentTypeClass = contentTypeClass;
this.html = html;
this.hasEditor = hasEditor;
this.isContainable = true;
this.getInnerText = function () {
return $($.parseHTML("<div>" + this.html + "</div>")).text();