Merge pull request #19 from cristianmusic7/master

dedywahyudi · web-flow · commit bf5ed84f9450 · 2017-10-15T16:45:43.000+07:00
drag and drop style, new entry focus and delete display fixes
diff --git a/example/notebook/res/sass/_style-guide-base.scss b/example/notebook/res/sass/_style-guide-base.scss
@@ -282,8 +282,11 @@
     }
 }
 
-.icon-notebook{
-    margin-right: 5px;
+
+.frame{
+   .icon-notebook{
+        margin-right: 5px;
+    } 
 }
 
 .overlay.l-dialog .title{
diff --git a/example/notebook/res/templates/notebook.html b/example/notebook/res/templates/notebook.html
@@ -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">
diff --git a/example/notebook/src/controllers/notebookController.js b/example/notebook/src/controllers/notebookController.js
@@ -138,6 +138,14 @@ define(
             }
         }
 
+        $scope.handleActive = function(){
+            var newEntry = $scope.entriesEl.find('.active');
+            if(newEntry){
+                newEntry.removeClass('active');
+            }
+        }
+
+
         $scope.clearSearch = function(){
             $scope.entrySearch = '';
         }
diff --git a/example/notebook/src/entryDnd.js b/example/notebook/src/entryDnd.js
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -282,8 +282,11 @@`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`
`285`		`-.icon-notebook{`
`286`		`- margin-right: 5px;`
	`285`	`+`
	`286`	`+.frame{`
	`287`	`+ .icon-notebook{`
	`288`	`+ margin-right: 5px;`
	`289`	`+ }`
`287`	`290`	`}`
`288`	`291`
`289`	`292`	`.overlay.l-dialog .title{`
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`	`+ var newEntry = $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`	`}`