Finishing up moving folders around

MeoMix · May 16, 2015 · fdafe0c · fdafe0c
1 parent 989c00c
commit fdafe0c
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 28 deletions.
diff --git a/Streamus Chrome Extension.csproj b/Streamus Chrome Extension.csproj
@@ -251,12 +251,12 @@
     <Content Include="src\js\background\mixin\collectionMultiSelect.js" />
     <Content Include="src\js\background\mixin\collectionSequence.js" />
     <Content Include="src\js\background\model\browserSettings.js" />
-    <Content Include="src\js\background\model\buttons\nextButton.js" />
-    <Content Include="src\js\background\model\buttons\playPauseButton.js" />
-    <Content Include="src\js\background\model\buttons\previousButton.js" />
-    <Content Include="src\js\background\model\buttons\radioButton.js" />
-    <Content Include="src\js\background\model\buttons\repeatButton.js" />
-    <Content Include="src\js\background\model\buttons\shuffleButton.js" />
+    <Content Include="src\js\background\model\nextButton.js" />
+    <Content Include="src\js\background\model\playPauseButton.js" />
+    <Content Include="src\js\background\model\previousButton.js" />
+    <Content Include="src\js\background\model\radioButton.js" />
+    <Content Include="src\js\background\model\repeatButton.js" />
+    <Content Include="src\js\background\model\shuffleButton.js" />
     <Content Include="src\js\background\model\clientErrorManager.js" />
     <Content Include="src\js\background\model\chromeContextMenusManager.js" />
     <Content Include="src\js\background\model\clientError.js" />

diff --git a/src/js/background/model/backgroundArea.js b/src/js/background/model/backgroundArea.js
@@ -16,12 +16,12 @@
     var Stream = require('background/model/stream');
     var TabManager = require('background/model/tabManager');
     var YouTubePlayer = require('background/model/youTubePlayer');
-    var NextButton = require('background/model/buttons/nextButton');
-    var PlayPauseButton = require('background/model/buttons/playPauseButton');
-    var PreviousButton = require('background/model/buttons/previousButton');
-    var RadioButton = require('background/model/buttons/radioButton');
-    var RepeatButton = require('background/model/buttons/repeatButton');
-    var ShuffleButton = require('background/model/buttons/shuffleButton');
+    var NextButton = require('background/model/nextButton');
+    var PlayPauseButton = require('background/model/playPauseButton');
+    var PreviousButton = require('background/model/previousButton');
+    var RadioButton = require('background/model/radioButton');
+    var RepeatButton = require('background/model/repeatButton');
+    var ShuffleButton = require('background/model/shuffleButton');
 
     var BackgroundArea = Backbone.Model.extend({
         defaults: function() {

diff --git a/src/js/foreground/view/stream/streamItemsView.js b/src/js/foreground/view/stream/streamItemsView.js
@@ -17,6 +17,7 @@
         childView: StreamItemView,
         childViewType: ListItemType.StreamItem,
         childViewOptions: function() {
+            console.log('parentId:', this.ui.listItems[0].id);
             return {
                 player: Streamus.backgroundPage.player,
                 playPauseButton: Streamus.backgroundPage.playPauseButton,

diff --git a/src/js/test/foreground/view/appBar/nextButtonView.spec.js b/src/js/test/foreground/view/appBar/nextButtonView.spec.js
@@ -2,14 +2,14 @@
     'use strict';
 
     var NextButtonView = require('foreground/view/appBar/nextButtonView');
-    var NextButton = require('background/model/buttons/nextButton');
+    var NextButton = require('background/model/nextButton');
     var Stream = require('background/model/stream');
     var Player = require('background/model/player');
     var Settings = require('background/model/settings');
     var YouTubePlayer = require('background/model/youTubePlayer');
-    var RadioButton = require('background/model/buttons/radioButton');
-    var ShuffleButton = require('background/model/buttons/shuffleButton');
-    var RepeatButton = require('background/model/buttons/repeatButton');
+    var RadioButton = require('background/model/radioButton');
+    var ShuffleButton = require('background/model/shuffleButton');
+    var RepeatButton = require('background/model/repeatButton');
 
     describe('NextButtonView', function() {
         beforeEach(function() {

diff --git a/src/js/test/foreground/view/appBar/playPauseButtonView.spec.js b/src/js/test/foreground/view/appBar/playPauseButtonView.spec.js
@@ -2,7 +2,7 @@
     'use strict';
 
     var PlayPauseButtonView = require('foreground/view/appBar/playPauseButtonView');
-    var PlayPauseButton = require('background/model/buttons/playPauseButton');
+    var PlayPauseButton = require('background/model/playPauseButton');
     var Player = require('background/model/player');
     var Settings = require('background/model/settings');
     var YouTubePlayer = require('background/model/youTubePlayer');

diff --git a/src/js/test/foreground/view/appBar/previousButtonView.spec.js b/src/js/test/foreground/view/appBar/previousButtonView.spec.js
@@ -2,14 +2,14 @@
     'use strict';
 
     var PreviousButtonView = require('foreground/view/appBar/previousButtonView');
-    var PreviousButton = require('background/model/buttons/previousButton');
+    var PreviousButton = require('background/model/previousButton');
     var Stream = require('background/model/stream');
     var Player = require('background/model/player');
     var Settings = require('background/model/settings');
     var YouTubePlayer = require('background/model/youTubePlayer');
-    var RadioButton = require('background/model/buttons/radioButton');
-    var ShuffleButton = require('background/model/buttons/shuffleButton');
-    var RepeatButton = require('background/model/buttons/repeatButton');
+    var RadioButton = require('background/model/radioButton');
+    var ShuffleButton = require('background/model/shuffleButton');
+    var RepeatButton = require('background/model/repeatButton');
 
     describe('PreviousButtonView', function() {
         beforeEach(function() {

diff --git a/src/js/test/foreground/view/stream/radioButtonView.spec.js b/src/js/test/foreground/view/stream/radioButtonView.spec.js
@@ -2,7 +2,7 @@
     'use strict';
 
     var RadioButtonView = require('foreground/view/stream/radioButtonView');
-    var RadioButton = require('background/model/buttons/radioButton');
+    var RadioButton = require('background/model/radioButton');
 
     describe('RadioButtonView', function() {
         beforeEach(function() {

diff --git a/src/js/test/foreground/view/stream/repeatButtonView.spec.js b/src/js/test/foreground/view/stream/repeatButtonView.spec.js
@@ -2,7 +2,7 @@
     'use strict';
 
     var RepeatButtonView = require('foreground/view/stream/repeatButtonView');
-    var RepeatButton = require('background/model/buttons/repeatButton');
+    var RepeatButton = require('background/model/repeatButton');
 
     describe('RepeatButtonView', function() {
         beforeEach(function() {

diff --git a/src/js/test/foreground/view/stream/shuffleButtonView.spec.js b/src/js/test/foreground/view/stream/shuffleButtonView.spec.js
@@ -2,7 +2,7 @@
     'use strict';
 
     var ShuffleButtonView = require('foreground/view/stream/shuffleButtonView');
-    var ShuffleButton = require('background/model/buttons/shuffleButton');
+    var ShuffleButton = require('background/model/shuffleButton');
 
     describe('ShuffleButtonView', function() {
         beforeEach(function() {

diff --git a/src/js/test/foreground/view/stream/streamItemView.spec.js b/src/js/test/foreground/view/stream/streamItemView.spec.js
@@ -7,7 +7,7 @@
     var Player = require('background/model/player');
     var Settings = require('background/model/settings');
     var YouTubePlayer = require('background/model/youTubePlayer');
-    var PlayPauseButton = require('background/model/buttons/playPauseButton');
+    var PlayPauseButton = require('background/model/playPauseButton');
     var ListItemType = require('common/enum/listItemType');
 
     describe('StreamItemView', function() {

diff --git a/src/js/test/foreground/view/stream/streamView.spec.js b/src/js/test/foreground/view/stream/streamView.spec.js
@@ -6,9 +6,9 @@
     var Player = require('background/model/player');
     var Settings = require('background/model/settings');
     var YouTubePlayer = require('background/model/youTubePlayer');
-    var ShuffleButton = require('background/model/buttons/shuffleButton');
-    var RadioButton = require('background/model/buttons/radioButton');
-    var RepeatButton = require('background/model/buttons/repeatButton');
+    var ShuffleButton = require('background/model/shuffleButton');
+    var RadioButton = require('background/model/radioButton');
+    var RepeatButton = require('background/model/repeatButton');
 
     describe('StreamView', function() {
         beforeEach(function() {