#84 - updated component's defintion to now-playlist

orizens · Jan 4, 2016 · bbd8956 · bbd8956
1 parent eebdab6
commit bbd8956
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 36 deletions.
diff --git a/src/components/now-playing/now-playlist/index.js b/src/components/now-playing/now-playlist/index.js
@@ -1,13 +1,14 @@
 import angular from 'angular';
 import AngularSortableView from 'angular-sortable-view/src/angular-sortable-view.js';
-import nowPlaylist from './now-playlist.component.js';
+import NowPlaylistComponent from './now-playlist.component';
 
 export default angular.module('now-playlist', [
 	    'app.core',
 	    'angular-sortable-view'
     ])
     .config(config)
-    .directive('nowPlaylist', nowPlaylist)
+    .directive(NowPlaylistComponent.controllerAs, () => NowPlaylistComponent)
+    // .directive(NowPlaylistComponent.controllerAs, () => NowPlaylistComponent)
 ;
 /* @ngInject */
 function config () {

diff --git a/src/components/now-playing/now-playlist/now-playlist.component.js b/src/components/now-playing/now-playlist/now-playlist.component.js
@@ -1,16 +1,9 @@
-import NowPlaylistCtrl from './now-playlist.ctrl.js';
 import template from './now-playlist.tpl.html';
 
-/* @ngInject */
-export default function nowPlaylist() {
-    // Usage:
-    //  <now-playlist></now-playlist>
-    // Creates:
-    //
-    var directive = {
+export let NowPlaylistComponent = {
         template,
-        controller: NowPlaylistCtrl,
         controllerAs: 'nowPlaylist',
+        // or "bindings" to follow ng1.5 "component" factory
         scope: {
             videos: '=',
             filter: '=',
@@ -21,7 +14,26 @@ export default function nowPlaylist() {
         },
         bindToController: true,
         replace: true,
-        restrict: 'E'
-    };
-    return directive;
+        restrict: 'E',
+        controller: 
+/* @ngInject */
+class NowPlaylistCtrl {
+    /* @ngInject */
+    constructor () {
+        // injected with this.videos, this.onRemove, this.onSelect
+        this.showPlaylistSaver = false;
+    }
+
+    removeVideo($event, video, $index) {
+        this.onRemove && this.onRemove({ $event, video, $index });
+    }
+
+    selectVideo (video, $index) {
+        this.onSelect && this.onSelect({ video, $index });
+    }
+
+    sortVideo($item, $indexTo) {
+        this.onSort && this.onSort({ $item, $indexTo });
+    }
+}
 }
diff --git a/src/components/now-playing/now-playlist/now-playlist.ctrl.js b/src/components/now-playing/now-playlist/now-playlist.ctrl.js
diff --git a/src/components/user-profile/user-profile.less b/src/components/user-profile/user-profile.less
@@ -47,7 +47,7 @@
 	> li a:hover,
 	> li.active a:hover,
 	> li.active a {
-		background: @primary-color;
+		background: @brand-primary;
 		color: @inverse;
 	}
 }

diff --git a/src/css/style.less b/src/css/style.less
@@ -33,7 +33,6 @@
 @import url('modules/Sidebar.less');
 @import url('modules/social.less');
 @import url('modules/updates.less');
-@import url('modules/user-profile.less');
 @import url('modules/youtube-player.less');
 @import url('modules/YoutubeItem.less');
 @import url('modules/YoutubePlaylistItem.less');