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

Fixed a column resizing issue.

Browse Source
This commit is contained in:
Daniel Stolt
2015-10-03 19:32:50 +02:00
parent bd96bf9895
commit 42914c7896
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Modules/Orchard.Layouts/Assets/JavaScript/Models/Column.js
View File

@@ -71,7 +71,7 @@
};
this.contractRight = function (connectAdjacent) {
if (!this.canContractRight())
if (!this.canContractRight(connectAdjacent))
return;
this.parent.contractColumnRight(this, connectAdjacent);
};
@@ -83,7 +83,7 @@
};
this.expandRight = function (connectAdjacent) {
if (!this.canExpandRight())
if (!this.canExpandRight(connectAdjacent))
return;
this.parent.expandColumnRight(this, connectAdjacent);
};
@@ -95,7 +95,7 @@
};
this.expandLeft = function (connectAdjacent) {
if (!this.canExpandLeft())
if (!this.canExpandLeft(connectAdjacent))
return;
this.parent.expandColumnLeft(this, connectAdjacent);
};
@@ -107,7 +107,7 @@
};
this.contractLeft = function (connectAdjacent) {
if (!this.canContractLeft())
if (!this.canContractLeft(connectAdjacent))
return;
this.parent.contractColumnLeft(this, connectAdjacent);
};

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

File diff suppressed because one or more lines are too long

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

4
src/Orchard.Web/Modules/Orchard.Layouts/Views/LayoutEditor.Template.Column.cshtml
View File

@@ -19,8 +19,8 @@
<li class="layout-panel-item layout-panel-action" title="@T("Decrease column offset (Alt+Left)")" ng-click="element.expandLeft(false)" ng-class="{disabled: !element.canExpandLeft(false)}"><i class="fa fa-outdent"></i></li>
<li class="layout-panel-item layout-panel-action" title="@T("Increase column offset (Alt+Right)")" ng-click="element.contractLeft(false)" ng-class="{disabled: !element.canContractLeft(false)}"><i class="fa fa-indent"></i></li>
</ul>
<div class="layout-column-resize-bar layout-column-resize-bar-left"></div>
<div class="layout-column-resize-bar layout-column-resize-bar-right"></div>
<div class="layout-column-resize-bar layout-column-resize-bar-left" ng-show="{{!element.isTemplated}}"></div>
<div class="layout-column-resize-bar layout-column-resize-bar-right" ng-show="{{!element.isTemplated}}"></div>
<div class="layout-container-children-placeholder">
@T("Drag an element from the toolbox and drop it here to add content.")
</div>