Moving models/collections into sub-folders

Streamus Chrome Extension.csproj

@@ -77,13 +77,15 @@
     <Content Include="src\js\common\enum\desktopNotificationDuration.js" />
     <Content Include="src\js\common\lodashMixin.js" />
     <Content Include="src\js\contentScript\interceptor.js" />
-    <Content Include="src\js\foreground\model\contextMenuAction.js" />
-    <Content Include="src\js\foreground\model\mediaSourceWrapper.js" />
-    <Content Include="src\js\foreground\model\sourceBufferWrapper.js" />
+    <Content Include="src\js\foreground\model\contextMenu\contextMenuAction.js" />
+    <Content Include="src\js\foreground\model\element\fixedMenuItem.js" />
+    <Content Include="src\js\foreground\model\video\mediaSourceWrapper.js" />
+    <Content Include="src\js\foreground\model\video\sourceBufferWrapper.js" />
     <Content Include="src\js\foreground\enum\keyCode.js" />
-    <Content Include="src\js\foreground\model\tooltip.js" />
+    <Content Include="src\js\foreground\model\tooltip\tooltip.js" />
     <Content Include="src\js\foreground\view\dialog\aboutStreamusDialogView.js" />
     <Content Include="src\js\foreground\view\dialog\aboutStreamusView.js" />
+    <Content Include="src\js\foreground\view\element\fixedMenuItemView.js" />
     <Content Include="src\js\foreground\view\element\simpleMenuItemsView.js" />
     <Content Include="src\js\foreground\view\leftPane\activePlaylistAreaView.js" />
     <Content Include="src\js\foreground\view\leftPane\leftPaneRegion.js" />
@@ -101,12 +103,14 @@
     <Content Include="src\js\test\common\commonSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\appBar\adminMenuAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\appBarRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\appBar\appBarSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\appBar\appBarView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\nextButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\playlistTitleView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\playPauseButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\previousButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\appBar\volumeAreaView.spec.js" />
+    <Content Include="src\js\test\foreground\view\behavior\behaviorSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\behavior\collectionViewMultiSelect.spec.js" />
     <Content Include="src\js\test\foreground\view\behavior\itemViewMultiSelect.spec.js" />
     <Content Include="src\js\test\foreground\view\behavior\scrollable.spec.js" />
@@ -116,32 +120,38 @@
     <Content Include="src\js\test\foreground\foregroundSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\contextMenu\contextMenuItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\contextMenu\contextMenuRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\contextMenu\contextMenuSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\contextMenu\contextMenuView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\aboutStreamusDialogView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\aboutStreamusView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\dialogContentView.spec.js" />
     <Content Include="src\js\test\foreground\view\dialog\dialogRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\dialog\dialogSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\dialog\dialogView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\checkboxView.spec.js" />
+    <Content Include="src\js\test\foreground\view\element\elementSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\element\radioButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\radioGroupView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\simpleListItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\simpleMenuItemsView.spec.js" />
+    <Content Include="src\js\test\foreground\view\element\fixedMenuItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\simpleMenuItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\simpleMenuView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\spinnerView.spec.js" />
     <Content Include="src\js\test\foreground\view\element\switchView.spec.js" />
     <Content Include="src\js\test\foreground\view\foregroundAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\leftPane\activePlaylistAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\leftPane\leftPaneRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\leftPane\leftPaneSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\leftPane\leftPaneView.spec.js" />
     <Content Include="src\js\test\foreground\view\leftPane\playlistItemsView.spec.js" />
     <Content Include="src\js\test\foreground\view\leftPane\playlistItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\leftPane\signInView.spec.js" />
     <Content Include="src\js\test\foreground\view\listItemButton\addPlaylistButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\listItemButton\addSongButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\listItemButton\deletePlaylistButtonView.spec.js" />
-    <Content Include="src\js\test\foreground\view\listItemButton\deleteSongButtonView.spec.js" />
+    <Content Include="src\js\test\foreground\view\listItemButton\deleteListItemButtonView.spec.js" />
+    <Content Include="src\js\test\foreground\view\listItemButton\listItemButtonSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\listItemButton\listItemButtonsView.spec.js" />
     <Content Include="src\js\test\foreground\view\listItemButton\listItemButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\listItemButton\moreActionsButtonView.spec.js" />
@@ -150,17 +160,21 @@
     <Content Include="src\js\test\foreground\view\listItemButton\saveSongButtonView.spec.js" />
     <Content Include="src\js\test\foreground\view\listItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\notification\notificationRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\notification\notificationSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\notification\notificationView.spec.js" />
     <Content Include="src\js\test\foreground\view\playlist\playlistsAreaRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\playlist\playlistsAreaView.spec.js" />
+    <Content Include="src\js\test\foreground\view\playlist\playlistSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\playlist\playlistsView.spec.js" />
     <Content Include="src\js\test\foreground\view\playlist\playlistView.spec.js" />
     <Content Include="src\js\test\foreground\view\saveSongs\saveSongsRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\search\searchAreaRegion.spec.js" />
     <Content Include="src\js\test\foreground\view\search\searchResultsView.spec.js" />
     <Content Include="src\js\test\foreground\view\search\searchResultView.spec.js" />
+    <Content Include="src\js\test\foreground\view\search\searchSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\search\searchView.spec.js" />
     <Content Include="src\js\test\foreground\view\selectionBar\selectionBarRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\selectionBar\selectionBarSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\selectionBar\selectionBarView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\activeStreamItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\clearStreamButtonView.spec.js" />
@@ -171,16 +185,20 @@
     <Content Include="src\js\test\foreground\view\stream\streamItemsView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\streamItemView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\streamRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\stream\streamSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\stream\streamView.spec.js" />
     <Content Include="src\js\test\foreground\view\stream\timeAreaView.spec.js" />
     <Content Include="src\js\test\foreground\view\tooltip\tooltipRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\tooltip\tooltipSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\tooltip\tooltipView.spec.js" />
     <Content Include="src\js\test\foreground\view\video\videoRegion.spec.js" />
+    <Content Include="src\js\test\foreground\view\video\videoSpecLoader.js" />
     <Content Include="src\js\test\foreground\view\video\videoView.spec.js" />
     <Content Include="src\js\thirdParty\test\chai.js" />
     <Content Include="src\js\thirdParty\test\mocha.js" />
     <Content Include="src\js\thirdParty\test\sinon.js" />
     <Content Include="src\template\dialog\aboutStreamus.html" />
+    <Content Include="src\template\element\menuItem.html" />
     <Content Include="src\template\icon\closeIcon_24.svg" />
     <Content Include="src\template\icon\deleteIcon_18.svg" />
     <Content Include="src\template\icon\menuIcon_24.svg" />
@@ -275,28 +293,28 @@
     <Content Include="src\js\background\model\youTubeV3API.js" />
     <Content Include="src\js\common\requireConfig.js" />
     <Content Include="src\js\common\enum\listItemType.js" />
-    <Content Include="src\js\foreground\collection\checkboxes.js" />
-    <Content Include="src\js\foreground\collection\radioButtons.js" />
-    <Content Include="src\js\foreground\collection\radioGroups.js" />
-    <Content Include="src\js\foreground\collection\simpleListItems.js" />
-    <Content Include="src\js\foreground\collection\simpleMenuItems.js" />
-    <Content Include="src\js\foreground\collection\switches.js" />
-    <Content Include="src\js\foreground\model\adminMenuArea.js" />
-    <Content Include="src\js\foreground\model\checkbox.js" />
-    <Content Include="src\js\foreground\model\clearStreamButton.js" />
-    <Content Include="src\js\foreground\model\radioButton.js" />
-    <Content Include="src\js\foreground\model\radioGroup.js" />
-    <Content Include="src\js\foreground\model\saveStreamButton.js" />
-    <Content Include="src\js\foreground\model\playlistAction.js" />
-    <Content Include="src\js\foreground\model\exportPlaylist.js" />
-    <Content Include="src\js\foreground\model\notification.js" />
+    <Content Include="src\js\foreground\collection\element\checkboxes.js" />
+    <Content Include="src\js\foreground\collection\element\radioButtons.js" />
+    <Content Include="src\js\foreground\collection\element\radioGroups.js" />
+    <Content Include="src\js\foreground\collection\element\simpleListItems.js" />
+    <Content Include="src\js\foreground\collection\element\simpleMenuItems.js" />
+    <Content Include="src\js\foreground\collection\element\switches.js" />
+    <Content Include="src\js\foreground\model\appBar\adminMenuArea.js" />
+    <Content Include="src\js\foreground\model\element\checkbox.js" />
+    <Content Include="src\js\foreground\model\stream\clearStreamButton.js" />
+    <Content Include="src\js\foreground\model\element\radioButton.js" />
+    <Content Include="src\js\foreground\model\element\radioGroup.js" />
+    <Content Include="src\js\foreground\model\stream\saveStreamButton.js" />
+    <Content Include="src\js\foreground\model\playlist\playlistAction.js" />
+    <Content Include="src\js\foreground\model\dialog\exportPlaylist.js" />
+    <Content Include="src\js\foreground\model\notification\notification.js" />
     <Content Include="src\js\background\model\tabManager.js" />
-    <Content Include="src\js\foreground\model\selectionBar.js" />
-    <Content Include="src\js\foreground\model\simpleListItem.js" />
-    <Content Include="src\js\foreground\model\simpleMenu.js" />
-    <Content Include="src\js\foreground\model\simpleMenuItem.js" />
-    <Content Include="src\js\foreground\model\switch.js" />
-    <Content Include="src\js\foreground\model\timeArea.js" />
+    <Content Include="src\js\foreground\model\selectionBar\selectionBar.js" />
+    <Content Include="src\js\foreground\model\element\simpleListItem.js" />
+    <Content Include="src\js\foreground\model\element\simpleMenu.js" />
+    <Content Include="src\js\foreground\model\element\simpleMenuItem.js" />
+    <Content Include="src\js\foreground\model\element\switch.js" />
+    <Content Include="src\js\foreground\model\stream\timeArea.js" />
     <Content Include="src\js\foreground\view\appBar\appBarRegion.js" />
     <Content Include="src\js\foreground\view\appBar\appBarView.js" />
     <Content Include="src\js\foreground\view\behavior\itemViewMultiSelect.js" />
@@ -349,12 +367,12 @@
     <Content Include="src\js\common\enum\repeatButtonState.js" />
     <Content Include="src\js\common\enum\youTubePlayerError.js" />
     <Content Include="src\js\foreground\application.js" />
-    <Content Include="src\js\foreground\collection\contextMenuItems.js" />
+    <Content Include="src\js\foreground\collection\contextMenu\contextMenuItems.js" />
     <Content Include="src\js\foreground\view\foregroundAreaView.js" />
     <Content Include="src\js\foreground\main.js" />
-    <Content Include="src\js\foreground\model\contextMenu.js" />
-    <Content Include="src\js\foreground\model\dialog.js" />
-    <Content Include="src\js\foreground\model\contextMenuItem.js" />
+    <Content Include="src\js\foreground\model\contextMenu\contextMenu.js" />
+    <Content Include="src\js\foreground\model\dialog\dialog.js" />
+    <Content Include="src\js\foreground\model\contextMenu\contextMenuItem.js" />
     <Content Include="src\js\background\model\search.js" />
     <Content Include="src\js\foreground\plugins.js" />
     <Content Include="src\js\foreground\view\behavior\slidingRender.js" />
@@ -366,7 +384,7 @@
     <Content Include="src\js\foreground\view\listItemView.js" />
     <Content Include="src\js\foreground\view\dialog\clearStreamDialogView.js" />
     <Content Include="src\js\foreground\view\dialog\settingsDialogView.js" />
-    <Content Include="src\js\foreground\view\listItemButton\deleteSongButtonView.js" />
+    <Content Include="src\js\foreground\view\listItemButton\deleteListItemButtonView.js" />
     <Content Include="src\js\foreground\view\dialog\updateStreamusDialogView.js" />
     <Content Include="src\js\foreground\view\listItemButton\saveSongButtonView.js" />
     <Content Include="src\js\foreground\view\appBar\playlistTitleView.js" />
@@ -457,7 +475,6 @@
     <Content Include="src\template\element\radioButton.html" />
     <Content Include="src\template\element\radioGroup.html" />
     <Content Include="src\template\element\simpleListItem.html" />
-    <Content Include="src\template\element\simpleMenuItem.html" />
     <Content Include="src\template\element\simpleMenu.html" />
     <Content Include="src\template\element\spinner.html" />
     <Content Include="src\template\element\switch.html" />

src/js/background/model/player.js

@@ -479,8 +479,6 @@ define(function(require) {
             var iframePort = this.get('iframePort');
             if (iframePort !== null) {
                 iframePort.postMessage('getCurrentTimeHighPrecision');
-            } else {
-                console.warn('iframe port is null');
             }
         }
     });

src/js/foreground/collection/contextMenuItems.js → src/js/foreground/collection/contextMenu/contextMenuItems.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var ContextMenuItem = require('foreground/model/contextMenuItem');
+    var ContextMenuItem = require('foreground/model/contextMenu/contextMenuItem');
 
     var ContextMenuItems = Backbone.Collection.extend({
         model: ContextMenuItem

src/js/foreground/collection/checkboxes.js → src/js/foreground/collection/element/checkboxes.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var Checkbox = require('foreground/model/checkbox');
+    var Checkbox = require('foreground/model/element/checkbox');
 
     var Checkboxes = Backbone.Collection.extend({
         model: Checkbox,

src/js/foreground/collection/radioButtons.js → src/js/foreground/collection/element/radioButtons.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var RadioButton = require('foreground/model/radioButton');
+    var RadioButton = require('foreground/model/element/radioButton');
 
     var RadioButtons = Backbone.Collection.extend({
         model: RadioButton,

src/js/foreground/collection/radioGroups.js → src/js/foreground/collection/element/radioGroups.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var RadioGroup = require('foreground/model/radioGroup');
+    var RadioGroup = require('foreground/model/element/radioGroup');
 
     var RadioGroups = Backbone.Collection.extend({
         model: RadioGroup,

src/js/foreground/collection/simpleListItems.js → src/js/foreground/collection/element/simpleListItems.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var SimpleListItem = require('foreground/model/simpleListItem');
+    var SimpleListItem = require('foreground/model/element/simpleListItem');
 
     var SimpleListItems = Backbone.Collection.extend({
         model: SimpleListItem

src/js/foreground/collection/simpleMenuItems.js → src/js/foreground/collection/element/simpleMenuItems.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var SimpleMenuItem = require('foreground/model/simpleMenuItem');
+    var SimpleMenuItem = require('foreground/model/element/simpleMenuItem');
 
     var SimpleMenuItems = Backbone.Collection.extend({
         model: SimpleMenuItem,

src/js/foreground/collection/switches.js → src/js/foreground/collection/element/switches.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var Switch = require('foreground/model/switch');
+    var Switch = require('foreground/model/element/switch');
 
     var Switches = Backbone.Collection.extend({
         model: Switch

src/js/foreground/model/contextMenu.js → src/js/foreground/model/contextMenu/contextMenu.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var ContextMenuItems = require('foreground/collection/contextMenuItems');
+    var ContextMenuItems = require('foreground/collection/contextMenu/contextMenuItems');
 
     var ContextMenu = Backbone.Model.extend({
         defaults: function() {

src/js/foreground/model/contextMenuAction.js → src/js/foreground/model/contextMenu/contextMenuAction.js

@@ -1,4 +1,4 @@
-define(function (require) {
+define(function () {
     'use strict';
 
     var ContextMenuAction = Backbone.Model.extend({

src/js/foreground/model/radioGroup.js → src/js/foreground/model/element/radioGroup.js

@@ -1,7 +1,7 @@
 define(function (require) {
     'use strict';
 
-    var RadioButtons = require('foreground/collection/radioButtons');
+    var RadioButtons = require('foreground/collection/element/radioButtons');
 
     var RadioGroup = Backbone.Model.extend({
         defaults: {

src/js/foreground/model/mediaSourceWrapper.js → src/js/foreground/model/video/mediaSourceWrapper.js

@@ -1,7 +1,7 @@
 define(function(require) {
     'use strict';
 
-    var SourceBufferWrapper = require('foreground/model/sourceBufferWrapper');
+    var SourceBufferWrapper = require('foreground/model/video/sourceBufferWrapper');
 
     var MediaSourceWrapper = Backbone.Model.extend({
         defaults: function() {

src/js/foreground/view/appBar/appBarView.js

@@ -1,7 +1,7 @@
 define(function(require) {
     'use strict';
 
-    var AdminMenuArea = require('foreground/model/adminMenuArea');
+    var AdminMenuArea = require('foreground/model/appBar/adminMenuArea');
     var AdminMenuAreaView = require('foreground/view/appBar/adminMenuAreaView');
     var NextButtonView = require('foreground/view/appBar/nextButtonView');
     var PlaylistTitleView = require('foreground/view/appBar/playlistTitleView');

src/js/foreground/view/behavior/itemViewMultiSelect.js

@@ -1,7 +1,7 @@
 define(function(require) {
     'use strict';
 
-    var Checkbox = require('foreground/model/checkbox');
+    var Checkbox = require('foreground/model/element/checkbox');
     var CheckboxView = require('foreground/view/element/checkboxView');
 
     var ItemViewMultiSelect = Marionette.Behavior.extend({

src/js/foreground/view/contextMenu/contextMenuRegion.js

@@ -1,7 +1,7 @@
 define(function(require) {
     'use strict';
 
-    var ContextMenu = require('foreground/model/contextMenu');
+    var ContextMenu = require('foreground/model/contextMenu/contextMenu');
     var ContextMenuView = require('foreground/view/contextMenu/contextMenuView');
 
     var ContextMenuRegion = Marionette.Region.extend({

src/js/foreground/view/dialog/aboutStreamusDialogView.js

@@ -1,7 +1,7 @@
 define(function(require) {
     'use strict';
 
-    var Dialog = require('foreground/model/dialog');
+    var Dialog = require('foreground/model/dialog/dialog');
     var AboutStreamusView = require('foreground/view/dialog/aboutStreamusView');
     var DialogView = require('foreground/view/dialog/dialogView');