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
This commit is contained in:
Sipke Schoorstra
2015-09-02 13:21:30 +01:00
parent a762cdf63e
commit 6995f26fd5
4 changed files with 7 additions and 7 deletions

View File

@@ -3,7 +3,7 @@
LayoutEditor.Column = function (data, htmlId, htmlClass, htmlStyle, isTemplated, width, offset, collapsible, rule, children) {
LayoutEditor.Element.call(this, "Column", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);
LayoutEditor.Container.call(this, ["Grid", "Content"], children);
this.isTemplatedContainer = true;
this.width = width;
this.offset = offset;
this.collapsible = collapsible;

View File

@@ -74,9 +74,9 @@
this.setIsFocused = function () {
if (!this.editor)
return;
if (this.isTemplated && this.isTemplatedContainer != true)
return;
return;
if (this.isTemplated)
return;
if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
return;

View File

@@ -151,7 +151,7 @@ var LayoutEditor;
this.setIsFocused = function () {
if (!this.editor)
return;
if (this.isTemplated && this.isTemplatedContainer != true)
if (this.isTemplated)
return;
if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
return;
@@ -755,7 +755,7 @@ var LayoutEditor;
LayoutEditor.Column = function (data, htmlId, htmlClass, htmlStyle, isTemplated, width, offset, collapsible, rule, children) {
LayoutEditor.Element.call(this, "Column", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);
LayoutEditor.Container.call(this, ["Grid", "Content"], children);
this.isTemplatedContainer = true;
this.width = width;
this.offset = offset;
this.collapsible = collapsible;

File diff suppressed because one or more lines are too long