Skip to content

drag and drop style, new entry focus and delete display fixes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 15, 2017
Merged

drag and drop style, new entry focus and delete display fixes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions example/notebook/res/sass/_style-guide-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,11 @@
}
}

.icon-notebook{
margin-right: 5px;

.frame{
.icon-notebook{
margin-right: 5px;
}
}

.overlay.l-dialog .title{
Expand Down
4 changes: 2 additions & 2 deletions example/notebook/res/templates/notebook.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@

<!-- entries -->

<div class="entries-wrapper">
<div class="entries-wrapper" ng-mouseover="handleActive()">
<ul class="entries-list">
<li class="entry l-flex-row" id="{{'entry_'+entry.createdOn}}" ng-if="hoursFilter(showTime,entry.createdOn)" ng-repeat="entry in model.entries | filter:entrySearch | orderBy: sortEntries track by $index" ng-class="{active : (!entry.embeds.length && !entry.text) }" ng-init="$last && finished(model.entries)" mct-entry-dnd>
<li class="entry l-flex-row" id="{{'entry_'+entry.createdOn}}" ng-if="hoursFilter(showTime,entry.createdOn)" ng-repeat="entry in model.entries | filter:entrySearch | orderBy: sortEntries track by $index" ng-init="$last && finished(model.entries)" mct-entry-dnd>
<div class="entry-time">{{entry.createdOn | date:'yyyy-MM-dd hh:mm:ss'}}</div>
<div class="entry-info">
<div class="entry-text">
Expand Down
8 changes: 8 additions & 0 deletions example/notebook/src/controllers/notebookController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@ define(
}
}

$scope.handleActive = function(){
var newEntry = $scope.entriesEl.find('.active');
if(newEntry){
newEntry.removeClass('active');
}
}


$scope.clearSearch = function(){
$scope.entrySearch = '';
}
Expand Down
2 changes: 0 additions & 2 deletions example/notebook/src/entryDnd.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@ define([
function entryDnd($rootScope,$compile,dndService,typeService) {

function link($scope, $element) {
var frame = $element.parent();
var actionCapability = $scope.domainObject.getCapability('action');
var domainObj = $scope.domainObject;

function drop(e) {
Expand Down