Commit Graph

23 Commits

Author SHA1 Message Date
Sipke Schoorstra
a492f89ea0 Further Layouts client-side scripting improvements.
- Pushed the editElement function further down from Content to Element, which means even less code for custom container elements.
- Fixed a bug where client-side element editor state would not be applied after editing that element.
- Pushed down the toObject function from Content to Element, which means less code is necessary for custom container elements.
-
2015-12-21 20:59:47 +01:00
Sipke Schoorstra
d1c0f98010 Updated Layouts to simplify custom container elements.
These changes simplifies the requirements for implementing custom container elements by minimizing the amount of code necessary to tie things together.
2015-12-21 19:48:59 +01:00
Sipke Schoorstra
8258bb3589 Moved AngularJS and Underscore to Resources. 2015-11-20 18:36:25 +01:00
Daniel Stolt
f8409d5ce5 Updated the Gulp pipeline.
NOTE: You need to run "npm update" from the solution folder to download the updated version of the dependencies for the updated Gulpfile to work properly.
2015-10-09 22:41:21 +02:00
Daniel Stolt
df216b6a18 Merge from Orchard/dev. 2015-10-04 01:57:19 +02:00
Daniel Stolt
42914c7896 Fixed a column resizing issue. 2015-10-03 19:32:50 +02:00
Daniel Stolt
bd96bf9895 Enabled focusing (and thereby pasting into) non-sealed templated containers. 2015-10-03 19:26:13 +02:00
Sebastien Ros
12a51ea7af [Fixes #5751, #5794] Removing Edit inline 2015-09-21 12:08:19 -07:00
Sipke Schoorstra
6995f26fd5 Revert "Relaxed focus targets to allow pasting of elements into templated containers."
This reverts commit dd34d87ac9.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Canvas.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
2015-09-02 13:21:30 +01:00
Sipke Schoorstra
a762cdf63e Revert "Incremental work on selectable elements."
This reverts commit 54c53b7a12.

Conflicts:
	src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Canvas.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
	src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
2015-09-02 13:16:41 +01:00
Daniel Stolt
f023f66d63 Merged branch '1.9.x' into dev. 2015-07-26 01:28:38 +01:00
Sipke Schoorstra
b37951e205 Merge branch '1.9.x' into dev
Conflicts:
 src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
 src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Migrations.cs
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationMessage.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Views/Elements/ValidationSummary.Design.cshtml
 src/Orchard.Web/Modules/Orchard.DynamicForms/Web.config
 src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
 src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/LayoutEditor.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.js
 src/Orchard.Web/Modules/Orchard.Layouts/Scripts/Models.min.js
 src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.css
 src/Orchard.Web/Modules/Orchard.Layouts/Styles/LayoutEditor.min.css
 src/Orchard.Web/Modules/Orchard.Layouts/Views/Elements/Shape.Design.cshtml
 src/Orchard.Web/Modules/Orchard.Layouts/Web.config
2015-07-04 14:27:04 +02:00
Sipke Schoorstra
b18f153e6a #5445: Fixed form field binding issues.
This fixes two issues:
1. Adding a Form element (and selecting the content type to create using the submitted values) and then adding a form element would not cause the Bindings tab to appear.
2. Adding nested containers (such as Grid, Row and Column) to a Form element would prevent the Bindings tab from appearing when adding a form field element such as TextField to a nested container.

Work Item: #5445
2015-07-04 00:37:14 +02:00
Daniel Stolt
45aeb7b467 Merged 1.9.x into dev. 2015-06-20 23:30:49 +03:00
Daniel Stolt
b06a4ecb73 #5403 Improved native clipboard support in layout editor. 2015-06-20 19:35:11 +03:00
Daniel Stolt
d86a5ec8c5 Replaced Web Essentials with Gulp for Orchard.Layouts.
Starting with VS2015, Web Essentials will no longer perform tasks such as bundling, minification and LESS compilation. Developers are expected to use either Grunt or Gulp for front-end build automation. In order to enable working with the codebase in VS2015 going forward, this change is therefore necessary.
2015-06-09 14:09:03 +03:00
Sipke Schoorstra
b3b75b3d74 Fixed copy/paste issue with Html element. 2015-04-18 20:48:16 +02:00
Sipke Schoorstra
eb61269d85 #21304: Fixed Text Element HTML filter issues.
- Implemented HTML filters for Html, Text and Paragraph elements
- Tokens are only processed on the front-end, not in the editor page itself. This also prevents an exception when the {Shape.Execute} token is used with a theme specific shape.

Work Item: 21304
2015-04-03 01:46:57 +02:00
Sipke Schoorstra
f02e147eaf Fixed url encoding / decoding issues.
This change consistifies when and where data and html properties are being URL decoded.
2015-03-12 00:23:05 +01:00
Sipke Schoorstra
657a285650 Fixed "Are you sure you want to leave this page?" even when layout is not dirty.
The issue was that during page initialization, the Content element's HTML would be serialized with the URL encoded version of its contents, but shortly after that HTML would be URL decoded, causing a difference in the serialized JSON between the initial serialization and final serialization (upon page unload).
2015-03-04 11:27:18 +01:00
Sipke Schoorstra
e26d70f3a5 #21226: Fixed that the Bindings tab doesn't appear for newly added form fields.
Work Item: 21226
2015-02-27 10:31:50 +01:00
Sipke Schoorstra
bcfdd0120c Fixed a client side HTML decoding issue. 2015-02-23 16:01:54 +01:00
Daniel Stolt
4b11d08ccd Merged 'feature/layouteditor' into 1.x. 2015-02-19 22:14:55 +01:00