Skip to content

Commit a526ba1

Browse files
committed
Squashed commit of the following:
commit 55a3f05 Author: Sean Anderson <[email protected]> Date: Mon Jul 6 23:20:39 2015 -0700 v0.178 commit c9a391c Author: Sean Anderson <[email protected]> Date: Mon Jul 6 20:38:19 2015 -0700 Test cases and fixing naming conventions commit 8650561 Author: Sean Anderson <[email protected]> Date: Mon Jul 6 19:36:39 2015 -0700 Fixing linting commit a99a7fa Author: Sean Anderson <[email protected]> Date: Mon Jul 6 19:36:10 2015 -0700 Changed implementation; much more simple now + more performant, woot! commit 5a993bf Author: Sean Anderson <[email protected]> Date: Mon Jul 6 17:45:09 2015 -0700 Pushing logic down a level to give more flexibility commit e92b507 Author: Sean Anderson <[email protected]> Date: Mon Jul 6 17:04:35 2015 -0700 Adding some test cases commit 45c5fea Author: Sean Anderson <[email protected]> Date: Mon Jul 6 16:41:58 2015 -0700 Fixing #596 commit 7082f46 Author: Sean Anderson <[email protected]> Date: Sun Jul 5 18:53:37 2015 -0700 Togglable split pane view implemented, need to test commit a0e0e5f Author: Sean Anderson <[email protected]> Date: Sun Jul 5 11:35:42 2015 -0700 Adding a LayoutType enum, but support for it isn't complete commit f31b863 Author: Sean Anderson <[email protected]> Date: Sun Jul 5 11:25:47 2015 -0700 Updating Marionette version commit ab9a3b5 Author: Sean Anderson <[email protected]> Date: Fri Jul 3 13:04:06 2015 -0700 Removing save, didn't need mean to add this. commit 8c74cd8 Author: Sean Anderson <[email protected]> Date: Fri Jul 3 13:03:50 2015 -0700 Patching 'settings' to have backwards compatibility for loading BrowserSettings commit 803f82a Merge: 23aca24 99cc8d8 Author: Sean Anderson <[email protected]> Date: Fri Jul 3 12:50:40 2015 -0700 Merge pull request #599 from L3K0V/Development Browser settings merged into Settings commit 99cc8d8 Author: Asen Lekov <[email protected]> Date: Fri Jul 3 02:53:50 2015 +0300 Browser settings merged into Settings commit 23aca24 Merge: 995cc80 4c44e91 Author: Sean Anderson <[email protected]> Date: Thu Jul 2 13:42:52 2015 -0700 Merge pull request #589 from L3K0V/Development Bulgarian locale added commit 4c44e91 Author: Asen Lekov <[email protected]> Date: Thu Jul 2 15:46:18 2015 +0300 Updated to v0.177 commit 4e41c2d Merge: 2d0c501 995cc80 Author: Asen Lekov <[email protected]> Date: Thu Jul 2 15:24:37 2015 +0300 Merge remote-tracking branch 'MeoMix/Development' into Development commit 995cc80 Merge: fbb6a86 6d470f1 Author: Sean Anderson <[email protected]> Date: Wed Jul 1 15:54:50 2015 -0700 Merge pull request #590 from MeoMix/master v0.177 commit 2d0c501 Author: Asen Lekov <[email protected]> Date: Wed Jul 1 02:07:12 2015 +0300 Better translation and fixed typos commit 1af9813 Merge: d2daaf5 c639eee Author: Asen Lekov <[email protected]> Date: Wed Jul 1 01:57:39 2015 +0300 Merge branch 'locale' into Development commit c639eee Author: Asen Lekov <[email protected]> Date: Wed Jul 1 01:54:35 2015 +0300 Better translation commit 502201d Author: Asen Lekov <[email protected]> Date: Wed Jul 1 01:45:53 2015 +0300 Fixes commit efbd18c Author: Asen Lekov <[email protected]> Date: Tue Jun 30 22:48:41 2015 +0300 Added bulgarian locale
1 parent 8837cfe commit a526ba1

File tree

73 files changed

+4794
-3862
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+4794
-3862
lines changed

Diff for: Gruntfile.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ module.exports = function(grunt) {
243243
src: ['package.json', 'src/manifest.json']
244244
}
245245
},
246-
'webstore_upload': {
246+
'webstore-upload': {
247247
accounts: {
248248
'default': {
249249
publish: false
@@ -321,7 +321,7 @@ module.exports = function(grunt) {
321321
grunt.task.run('compressRelease:' + operaReleaseDirectory + ':sanitize=true');
322322

323323
if (isRelease) {
324-
grunt.task.run('webstore_upload');
324+
grunt.task.run('webstore-upload');
325325
}
326326
});
327327

Diff for: Streamus Chrome Extension.csproj

+16-23
Original file line numberDiff line numberDiff line change
@@ -73,27 +73,32 @@
7373
<Content Include="src\img\streamus_icon38.png" />
7474
<Content Include="src\img\streamus_icon48.png" />
7575
<Content Include="src\img\streamus_icon_white19.png" />
76+
<Content Include="src\js\foreground\collection\activePane\activePanes.js" />
7677
<Content Include="src\js\background\enum\entityType.js" />
7778
<Content Include="src\js\background\model\activePlaylistManager.js" />
7879
<Content Include="src\js\background\model\analyticsManager.js" />
80+
<Content Include="src\js\foreground\model\activePane\activePane.js" />
7981
<Content Include="src\js\background\model\videoButton.js" />
8082
<Content Include="src\js\common\enum\desktopNotificationDuration.js" />
83+
<Content Include="src\js\common\enum\layoutType.js" />
8184
<Content Include="src\js\common\lodashMixin.js" />
8285
<Content Include="src\js\contentScript\interceptor.js" />
8386
<Content Include="src\js\foreground\enum\fixedPosition.js" />
87+
<Content Include="src\js\foreground\enum\activePaneType.js" />
8488
<Content Include="src\js\foreground\model\appBar\activePaneFilter.js" />
8589
<Content Include="src\js\foreground\model\dialog\createPlaylist.js" />
8690
<Content Include="src\js\foreground\model\dialog\editPlaylist.js" />
8791
<Content Include="src\js\foreground\model\listItemButton\listItemButton.js" />
8892
<Content Include="src\js\foreground\model\song\songActions.js" />
93+
<Content Include="src\js\foreground\model\streamControlBar\timeLabelArea.js" />
94+
<Content Include="src\js\foreground\model\streamControlBar\timeSlider.js" />
8995
<Content Include="src\js\foreground\model\video\mediaSourceWrapper.js" />
9096
<Content Include="src\js\foreground\model\video\sourceBufferWrapper.js" />
9197
<Content Include="src\js\foreground\enum\keyCode.js" />
9298
<Content Include="src\js\foreground\model\tooltip\tooltip.js" />
93-
<Content Include="src\js\foreground\view\activePane\activePaneRegion.js" />
99+
<Content Include="src\js\foreground\view\activePane\activePanesRegion.js" />
100+
<Content Include="src\js\foreground\view\activePane\activePanesView.js" />
94101
<Content Include="src\js\foreground\view\activePane\activePaneView.js" />
95-
<Content Include="src\js\foreground\view\activePane\panesView.js" />
96-
<Content Include="src\js\foreground\view\activePane\paneView.js" />
97102
<Content Include="src\js\foreground\view\appBar\activePaneFilterView.js" />
98103
<Content Include="src\js\foreground\view\appBar\searchInputAreaView.js" />
99104
<Content Include="src\js\foreground\view\behavior\dialogContent.js" />
@@ -109,11 +114,8 @@
109114
<Content Include="src\js\foreground\view\listItemButton\playlistOptionsButtonView.js" />
110115
<Content Include="src\js\foreground\view\simpleMenu\simpleMenuItemsView.js" />
111116
<Content Include="src\js\foreground\view\leftPane\activePlaylistAreaView.js" />
112-
<Content Include="src\js\foreground\view\leftPane\leftPaneRegion.js" />
113-
<Content Include="src\js\foreground\view\leftPane\leftPaneView.js" />
114117
<Content Include="src\js\foreground\view\leftPane\playlistItemsView.js" />
115118
<Content Include="src\js\foreground\view\leftPane\playlistItemView.js" />
116-
<Content Include="src\js\foreground\view\leftPane\signInView.js" />
117119
<Content Include="src\js\foreground\view\listItemButton\songOptionsButtonView.js" />
118120
<Content Include="src\js\foreground\view\streamControlBar\nextButtonView.js" />
119121
<Content Include="src\js\foreground\view\streamControlBar\playPauseButtonView.js" />
@@ -139,9 +141,12 @@
139141
<Content Include="src\js\test\chrome.mock.js" />
140142
<Content Include="src\js\test\common\commonSpecLoader.js" />
141143
<Content Include="src\js\test\background\model\activePlaylistManager.spec.js" />
144+
<Content Include="src\js\test\foreground\collection\activePane\panes.spec.js" />
142145
<Content Include="src\js\test\foreground\model\appBar\activePaneFilter.spec.js" />
143-
<Content Include="src\js\test\foreground\view\activePane\activePaneView.spec.js" />
146+
<Content Include="src\js\test\foreground\view\activePane\activePanesRegion.spec.js" />
144147
<Content Include="src\js\test\foreground\view\activePane\activePaneSpecLoader.js" />
148+
<Content Include="src\js\test\foreground\view\activePane\activePanesView.spec.js" />
149+
<Content Include="src\js\test\foreground\view\activePane\activePaneView.spec.js" />
145150
<Content Include="src\js\test\foreground\view\appBar\activePaneFilterView.spec.js" />
146151
<Content Include="src\js\test\foreground\view\appBar\adminMenuAreaView.spec.js" />
147152
<Content Include="src\js\test\foreground\view\appBar\appBarRegion.spec.js" />
@@ -158,9 +163,6 @@
158163
<Content Include="src\js\test\foreground\view\streamControlBar\streamControlBarView.spec.js" />
159164
<Content Include="src\js\test\foreground\view\streamControlBar\timeLabelAreaView.spec.js" />
160165
<Content Include="src\js\test\foreground\view\streamControlBar\timeSliderView.spec.js" />
161-
<Content Include="src\js\test\foreground\view\stream\nextButtonView.spec.js" />
162-
<Content Include="src\js\test\foreground\view\stream\playPauseButtonView.spec.js" />
163-
<Content Include="src\js\test\foreground\view\stream\previousButtonView.spec.js" />
164166
<Content Include="src\js\test\foreground\view\appBar\volumeAreaView.spec.js" />
165167
<Content Include="src\js\test\foreground\view\behavior\behaviorSpecLoader.js" />
166168
<Content Include="src\js\test\foreground\view\behavior\collectionViewMultiSelect.spec.js" />
@@ -228,19 +230,13 @@
228230
<Content Include="src\js\test\foreground\view\selectionBar\selectionBarRegion.spec.js" />
229231
<Content Include="src\js\test\foreground\view\selectionBar\selectionBarSpecLoader.js" />
230232
<Content Include="src\js\test\foreground\view\selectionBar\selectionBarView.spec.js" />
231-
<Content Include="src\js\test\foreground\view\stream\activeStreamItemView.spec.js" />
232233
<Content Include="src\js\test\foreground\view\stream\clearStreamButtonView.spec.js" />
233-
<Content Include="src\js\test\foreground\view\stream\radioButtonView.spec.js" />
234-
<Content Include="src\js\test\foreground\view\stream\repeatButtonView.spec.js" />
235234
<Content Include="src\js\test\foreground\view\stream\saveStreamButtonView.spec.js" />
236-
<Content Include="src\js\test\foreground\view\stream\shuffleButtonView.spec.js" />
237235
<Content Include="src\js\test\foreground\view\stream\streamItemsView.spec.js" />
238236
<Content Include="src\js\test\foreground\view\stream\streamItemView.spec.js" />
239237
<Content Include="src\js\test\foreground\view\stream\streamRegion.spec.js" />
240238
<Content Include="src\js\test\foreground\view\stream\streamSpecLoader.js" />
241239
<Content Include="src\js\test\foreground\view\stream\streamView.spec.js" />
242-
<Content Include="src\js\test\foreground\view\stream\timeLabelAreaView.spec.js" />
243-
<Content Include="src\js\test\foreground\view\stream\timeSliderView.spec.js" />
244240
<Content Include="src\js\test\foreground\view\tooltip\tooltipRegion.spec.js" />
245241
<Content Include="src\js\test\foreground\view\tooltip\tooltipSpecLoader.js" />
246242
<Content Include="src\js\test\foreground\view\tooltip\tooltipView.spec.js" />
@@ -252,6 +248,7 @@
252248
<Content Include="src\js\thirdParty\test\chai.js" />
253249
<Content Include="src\js\thirdParty\test\mocha.js" />
254250
<Content Include="src\js\thirdParty\test\sinon.js" />
251+
<Content Include="src\template\activePane\activePanes.html" />
255252
<Content Include="src\template\activePane\activePane.html" />
256253
<Content Include="src\template\appBar\activePaneFilter.html" />
257254
<Content Include="src\template\appBar\searchInputArea.html" />
@@ -308,7 +305,6 @@
308305
<Content Include="src\js\background\main.js" />
309306
<Content Include="src\js\background\mixin\collectionMultiSelect.js" />
310307
<Content Include="src\js\background\mixin\collectionSequence.js" />
311-
<Content Include="src\js\background\model\browserSettings.js" />
312308
<Content Include="src\js\background\model\nextButton.js" />
313309
<Content Include="src\js\background\model\playPauseButton.js" />
314310
<Content Include="src\js\background\model\previousButton.js" />
@@ -389,10 +385,8 @@
389385
<Content Include="src\js\foreground\view\listItemButton\addPlaylistButtonView.js" />
390386
<Content Include="src\js\foreground\view\listItemButton\deletePlaylistButtonView.js" />
391387
<Content Include="src\js\foreground\view\playlist\playlistsView.js" />
392-
<Content Include="src\js\foreground\view\dialog\browserSettingsView.js" />
393388
<Content Include="src\js\foreground\view\listItemButton\playPlaylistButtonView.js" />
394389
<Content Include="src\js\foreground\view\dialog\exportPlaylistView.js" />
395-
<Content Include="src\js\foreground\view\dialog\browserSettingsDialogView.js" />
396390
<Content Include="src\js\foreground\view\selectionBar\selectionBarRegion.js" />
397391
<Content Include="src\js\foreground\view\selectionBar\selectionBarView.js" />
398392
<Content Include="src\js\foreground\view\stream\clearStreamButtonView.js" />
@@ -452,8 +446,6 @@
452446
<Content Include="src\js\test\background\model\clientErrorManager.spec.js" />
453447
<Content Include="src\js\test\background\model\signInManager.spec.js" />
454448
<Content Include="src\js\test\background\model\user.spec.js" />
455-
<Content Include="src\js\test\foreground\view\dialog\browserSettingsDialogView.spec.js" />
456-
<Content Include="src\js\test\foreground\view\dialog\browserSettingsView.spec.js" />
457449
<Content Include="src\js\test\foreground\view\dialog\clearStreamDialogView.spec.js" />
458450
<Content Include="src\js\test\foreground\view\dialog\createPlaylistDialogView.spec.js" />
459451
<Content Include="src\js\test\foreground\view\dialog\createPlaylistView.spec.js" />
@@ -505,6 +497,7 @@
505497
<Content Include="src\less\appBar.less" />
506498
<Content Include="src\less\flexRow.less" />
507499
<Content Include="src\less\activePaneFilter.less" />
500+
<Content Include="src\less\activePane.less" />
508501
<None Include="src\less\foreground.less" />
509502
<Content Include="src\template\appBar\appBar.html" />
510503
<Content Include="src\template\backgroundArea.html" />
@@ -521,7 +514,6 @@
521514
<Content Include="src\template\listItemButton\optionsListItemButton.html" />
522515
<Content Include="src\template\listItemButton\playPauseSongButton.html" />
523516
<Content Include="src\template\playlist\playlists.html" />
524-
<Content Include="src\template\dialog\browserSettings.html" />
525517
<Content Include="src\template\dialog\exportPlaylist.html" />
526518
<Content Include="src\template\appBar\adminMenuArea.html" />
527519
<Content Include="src\template\notification\notification.html" />
@@ -609,6 +601,7 @@
609601
<Content Include="src\less\streamControlBar.less" />
610602
<Content Include="src\less\video.less" />
611603
<Content Include="src\less\searchInputArea.less" />
604+
<Content Include="src\less\searchArea.less" />
612605
</ItemGroup>
613606
<ItemGroup>
614607
<Content Include="src\manifest.json" />
@@ -644,7 +637,7 @@
644637
</FlavorProperties>
645638
</VisualStudio>
646639
</ProjectExtensions>
647-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
640+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
648641
Other similar extension points exist, see Microsoft.Common.targets.
649642
<Target Name="BeforeBuild">
650643
</Target>

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Streamus",
3-
"version": "0.177.0",
3+
"version": "0.178.0",
44
"private": true,
55
"description": "Streamus - The most popular Chrome extension YouTube music player",
66
"devDependencies": {

0 commit comments

Comments
 (0)