mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
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
This commit is contained in:
@@ -12,10 +12,6 @@
|
||||
result.children = this.childrenToObject();
|
||||
return result;
|
||||
};
|
||||
|
||||
this.allowSealedFocus = function() {
|
||||
return this.children.length === 0;
|
||||
}
|
||||
};
|
||||
|
||||
LayoutEditor.Canvas.from = function (value) {
|
||||
|
@@ -3,6 +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;
|
||||
@@ -11,10 +12,6 @@
|
||||
var _origWidth = 0;
|
||||
var _origOffset = 0;
|
||||
|
||||
this.allowSealedFocus = function () {
|
||||
return this.children.length === 0;
|
||||
}
|
||||
|
||||
this.beginChange = function () {
|
||||
if (!!_hasPendingChange)
|
||||
throw new Error("Column already has a pending change.");
|
||||
|
@@ -72,14 +72,10 @@
|
||||
return this.editor.focusedElement === this;
|
||||
};
|
||||
|
||||
this.allowSealedFocus = function() {
|
||||
return false;
|
||||
};
|
||||
|
||||
this.setIsFocused = function () {
|
||||
if (!this.editor)
|
||||
return;
|
||||
if (this.isTemplated && !this.allowSealedFocus())
|
||||
if (this.isTemplated && this.isTemplatedContainer != true)
|
||||
return;
|
||||
if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
|
||||
return;
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user