Commitbf5ed84

authored

Merge pull request#19 from cristianmusic7/master

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

2 parents3cf1ad8 +7c34f03 commitbf5ed84Copy full SHA for bf5ed84

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 5 additions & 2 deletions

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,9 @@`
`51`	`51`
`52`	`52`	`<!-- entries -->`
`53`	`53`
`54`		`-<divclass="entries-wrapper">`
	`54`	`+<divclass="entries-wrapper"ng-mouseover="handleActive()">`
`55`	`55`	`<ulclass="entries-list">`
`56`		`-<liclass="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>`
	`56`	`+<liclass="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>`
`57`	`57`	`<divclass="entry-time">{{entry.createdOn \| date:'yyyy-MM-dd hh:mm:ss'}}</div>`
`58`	`58`	`<divclass="entry-info">`
`59`	`59`	`<divclass="entry-text">`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,14 @@ define(`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`
	`141`	`+$scope.handleActive=function(){`
	`142`	`+varnewEntry=$scope.entriesEl.find('.active');`
	`143`	`+if(newEntry){`
	`144`	`+newEntry.removeClass('active');`
	`145`	`+}`
	`146`	`+}`
	`147`	`+`
	`148`	`+`
`141`	`149`	`$scope.clearSearch=function(){`
`142`	`150`	`$scope.entrySearch='';`
`143`	`151`	`}`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,6 @@ define([`
`33`	`33`	`functionentryDnd($rootScope,$compile,dndService,typeService){`
`34`	`34`
`35`	`35`	`functionlink($scope,$element){`
`36`		`-varframe=$element.parent();`
`37`		`-varactionCapability=$scope.domainObject.getCapability('action');`
`38`	`36`	`vardomainObj=$scope.domainObject;`
`39`	`37`
`40`	`38`	`functiondrop(e){`

Comments

(0)