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

Incremental work on selectable elements.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-04-20 23:07:27 +02:00
parent dd34d87ac9
commit 54c53b7a12
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,10 +142,14 @@ var LayoutEditor;
return this.editor.focusedElement === this;
};
this.allowSealedFocus = function() {
return false;
};
this.setIsFocused = function () {
if (!this.editor)
return;
if (this.isTemplated && this.isTemplatedContainer != true)
if (this.isTemplated && !this.allowSealedFocus())
return;
if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
return;
@@ -393,13 +397,16 @@ var LayoutEditor;
LayoutEditor.Canvas = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {
LayoutEditor.Element.call(this, "Canvas", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);
LayoutEditor.Container.call(this, ["Grid", "Content"], children);
this.isTemplatedContainer = true;
this.toObject = function () {
var result = this.elementToObject();
result.children = this.childrenToObject();
return result;
};
this.allowSealedFocus = function() {
return this.children.length === 0;
}
};
LayoutEditor.Canvas.from = function (value) {
@@ -742,7 +749,6 @@ 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;
@@ -751,6 +757,10 @@ var LayoutEditor;
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.");

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

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

@@ -4,13 +4,16 @@
LayoutEditor.Canvas = function (data, htmlId, htmlClass, htmlStyle, isTemplated, rule, children) {
LayoutEditor.Element.call(this, "Canvas", data, htmlId, htmlClass, htmlStyle, isTemplated, rule);
LayoutEditor.Container.call(this, ["Grid", "Content"], children);
this.isTemplatedContainer = true;
this.toObject = function () {
var result = this.elementToObject();
result.children = this.childrenToObject();
return result;
};
this.allowSealedFocus = function() {
return this.children.length === 0;
}
};
LayoutEditor.Canvas.from = function (value) {

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

@@ -3,7 +3,6 @@
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;
@@ -12,6 +11,10 @@
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.");

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

@@ -66,10 +66,14 @@
return this.editor.focusedElement === this;
};
this.allowSealedFocus = function() {
return false;
};
this.setIsFocused = function () {
if (!this.editor)
return;
if (this.isTemplated && this.isTemplatedContainer != true)
if (this.isTemplated && !this.allowSealedFocus())
return;
if (this.editor.isDragging || this.editor.inlineEditingIsActive || this.editor.isResizing)
return;