yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sorting row with last release ui.sortable lib and sorting control published

Browse Source
This commit is contained in:
antoine
2014-09-07 16:23:24 +02:00
parent ef6e181eb1
commit 8db67c0ba3
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/less/gridview.less
View File

@@ -125,6 +125,11 @@
}
/*.usky-grid .selectedRow {
border: 1px solid rgba(182, 182, 182, 0.3);
}*/
// CELL
@@ -219,13 +224,14 @@
}
.usky-grid .usky-control:hover{
border: 1px dashed rgba(182, 182, 182, 0.3);
/*border: 1px solid rgba(182, 182, 182, 0.3);*/
border-bottom: 2px solid rgba(182, 182, 182, 0.3);
}
.usky-grid .usky-control-placeholder:hover{
border-bottom:2px solid rgba(182, 182, 182, 0.0) !important;
/*border: 1px solid rgba(182, 182, 182, 0);*/
border-bottom:2px solid rgba(182, 182, 182, 0.0) !important;
}
.usky-grid .removingControl{

12
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
View File

@@ -23,12 +23,12 @@ angular.module("umbraco")
start: function (e, ui) {
ui.item.find('.mceNoEditor').each(function () {
tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
});
},
stop: function (e, ui) {
ui.item.find('.mceNoEditor').each(function () {
ui.item.parents(".usky-column").find('.mceNoEditor').each(function () {
tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
});
}
@@ -109,10 +109,10 @@ angular.module("umbraco")
},
stop: function (e, ui) {
ui.item.parents(".usky-cell").find('.mceNoEditor').each(function () {
tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
});
//ui.item.parents(".usky-cell").find('.mceNoEditor').each(function () {
// tinyMCE.execCommand('mceRemoveEditor', false, $(this).attr('id'));
// tinyMCE.execCommand('mceAddEditor', false, $(this).attr('id'));
//});
}
}

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
View File

@@ -43,7 +43,7 @@
class="usky-row"
ng-mouseover="setCurrentRow(row)"
ng-mouseleave="disableCurrentRow()"
ng-class="{removingControl:currentRemoveControl == row, movingControl:currentMovedRow == row}">
ng-class="{removingControl:currentRemoveControl == row, movingControl:currentMovedRow == row, selectedRow:currentRow == row && currentControl === null}">
<!-- Row tool -->
<div class="row-tools" ng-animate="'fade'"