open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Searching from missing won't trigger spinner on both buttons

Browse Source 
Some formatting updates
pull/3113/head
Mark McDowall 11 years ago
parent e7683642dd
commit 2fdb0513e8
4 changed files with 389 additions and 388 deletions
Show Stats Download Patch File Download Diff File

4
src/UI/.idea/codeStyleSettings.xml
Unescape View File

@ -17,6 +17,7 @@
<option name="VALUE_ALIGNMENT" value="1" />
</CssCodeStyleSettings>
<JSCodeStyleSettings>
<option name="SPACE_BEFORE_PROPERTY_COLON" value="true" />
<option name="ALIGN_OBJECT_PROPERTIES" value="2" />
</JSCodeStyleSettings>
<XML>
@ -33,8 +34,7 @@
<option name="ELSE_ON_NEW_LINE" value="true" />
<option name="CATCH_ON_NEW_LINE" value="true" />
<option name="FINALLY_ON_NEW_LINE" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
<option name="SPACE_AFTER_COLON" value="false" />
<option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="2" />
<option name="IF_BRACE_FORCE" value="3" />

4
src/UI/Shared/Toolbar/Button/ButtonView.js
Unescape View File

@ -33,6 +33,10 @@ define(
this.$el.addClass('btn-icon-only');
}
if (this.model.get('className')) {
this.$el.addClass(this.model.get('className'));
}
var command = this.model.get('command');
if (command) {
var properties = _.extend({ name: command }, this.model.get('properties'));

79
src/UI/Wanted/Cutoff/CutoffUnmetLayout.js
Unescape View File

@ -1,6 +1,5 @@
'use strict';
define(
[
define([
'underscore',
'marionette',
'backgrid',
@ -16,7 +15,7 @@ define(
'Shared/Messenger',
'Commands/CommandController',
'backgrid.selectall'
], function (_,
], function (_,
Marionette,
Backgrid,
CutoffUnmetCollection,
@ -31,24 +30,23 @@ define(
Messenger,
CommandController) {
return Marionette.Layout.extend({
template: 'Wanted/Cutoff/CutoffUnmetLayoutTemplate',
template : 'Wanted/Cutoff/CutoffUnmetLayoutTemplate',
regions: {
regions : {
cutoff : '#x-cutoff-unmet',
toolbar : '#x-toolbar',
pager : '#x-pager'
},
ui: {
searchSelectedButton: '.btn i.icon-search'
ui : {
searchSelectedButton : '.btn i.icon-search'
},
columns:
[
columns : [
{
name : '',
cell : 'select-row',
headerCell: 'select-all',
headerCell : 'select-all',
sortable : false
},
{
@ -67,7 +65,7 @@ define(
name : 'this',
label : 'Episode Title',
sortable : false,
cell : EpisodeTitleCell,
cell : EpisodeTitleCell
},
{
name : 'airDateUtc',
@ -78,26 +76,26 @@ define(
name : 'status',
label : 'Status',
cell : EpisodeStatusCell,
sortable: false
sortable : false
}
],
initialize: function () {
initialize : function () {
this.collection = new CutoffUnmetCollection();
this.listenTo(this.collection, 'sync', this._showTable);
},
onShow: function () {
onShow : function () {
this.cutoff.show(new LoadingView());
this._showToolbar();
this.collection.fetch();
},
_showTable: function () {
_showTable : function () {
this.cutoffGrid = new Backgrid.Grid({
columns : this.columns,
collection: this.collection,
collection : this.collection,
className : 'table table-hover'
});
@ -105,26 +103,26 @@ define(
this.pager.show(new GridPager({
columns : this.columns,
collection: this.collection
collection : this.collection
}));
},
_showToolbar: function () {
_showToolbar : function () {
var leftSideButtons = {
type : 'default',
storeState: false,
items :
[
storeState : false,
items : [
{
title: 'Search Selected',
title : 'Search Selected',
icon : 'icon-search',
callback: this._searchSelected,
ownerContext: this
callback : this._searchSelected,
ownerContext : this,
className : 'x-search-selected'
},
{
title: 'Season Pass',
title : 'Season Pass',
icon : 'icon-bookmark',
route: 'seasonpass'
route : 'seasonpass'
}
]
};
@ -134,8 +132,7 @@ define(
storeState : false,
menuKey : 'wanted.filterMode',
defaultAction : 'monitored',
items :
[
items : [
{
key : 'monitored',
title : '',
@ -154,26 +151,24 @@ define(
};
this.toolbar.show(new ToolbarLayout({
left :
[
left : [
leftSideButtons
],
right :
[
right : [
filterOptions
],
context: this
context : this
}));
CommandController.bindToCommand({
element: this.$('.x-toolbar-left-1 .btn i.icon-search'),
command: {
name: 'episodeSearch'
element : this.$('.x-search-selected'),
command : {
name : 'episodeSearch'
}
});
},
_setFilter: function(buttonContext) {
_setFilter : function (buttonContext) {
var mode = buttonContext.model.get('key');
this.collection.state.currentPage = 1;
@ -184,13 +179,13 @@ define(
}
},
_searchSelected: function () {
_searchSelected : function () {
var selected = this.cutoffGrid.getSelectedModels();
if (selected.length === 0) {
Messenger.show({
type: 'error',
message: 'No episodes selected'
type : 'error',
message : 'No episodes selected'
});
return;
@ -200,8 +195,8 @@ define(
CommandController.Execute('episodeSearch', {
name : 'episodeSearch',
episodeIds: ids
episodeIds : ids
});
}
});
});
});

110
src/UI/Wanted/Missing/MissingLayout.js
Unescape View File

@ -1,6 +1,5 @@
'use strict';
define(
[
define([
'underscore',
'marionette',
'backgrid',
@ -16,7 +15,7 @@ define(
'Shared/Messenger',
'Commands/CommandController',
'backgrid.selectall'
], function (_,
], function (_,
Marionette,
Backgrid,
MissingCollection,
@ -31,24 +30,23 @@ define(
Messenger,
CommandController) {
return Marionette.Layout.extend({
template: 'Wanted/Missing/MissingLayoutTemplate',
template : 'Wanted/Missing/MissingLayoutTemplate',
regions: {
missing: '#x-missing',
toolbar: '#x-toolbar',
regions : {
missing : '#x-missing',
toolbar : '#x-toolbar',
pager : '#x-pager'
},
ui: {
searchSelectedButton: '.btn i.icon-search'
ui : {
searchSelectedButton : '.btn i.icon-search'
},
columns:
[
columns : [
{
name : '',
cell : 'select-row',
headerCell: 'select-all',
headerCell : 'select-all',
sortable : false
},
{
@ -78,26 +76,26 @@ define(
name : 'status',
label : 'Status',
cell : EpisodeStatusCell,
sortable: false
sortable : false
}
],
initialize: function () {
initialize : function () {
this.collection = new MissingCollection();
this.listenTo(this.collection, 'sync', this._showTable);
},
onShow: function () {
onShow : function () {
this.missing.show(new LoadingView());
this._showToolbar();
this.collection.fetch();
},
_showTable: function () {
_showTable : function () {
this.missingGrid = new Backgrid.Grid({
columns : this.columns,
collection: this.collection,
collection : this.collection,
className : 'table table-hover'
});
@ -105,40 +103,41 @@ define(
this.pager.show(new GridPager({
columns : this.columns,
collection: this.collection
collection : this.collection
}));
},
_showToolbar: function () {
_showToolbar : function () {
var leftSideButtons = {
type : 'default',
storeState : false,
collapse : true,
items :
[
items : [
{
title: 'Search Selected',
title : 'Search Selected',
icon : 'icon-search',
callback: this._searchSelected,
ownerContext: this
callback : this._searchSelected,
ownerContext : this,
className : 'x-search-selected'
},
{
title: 'Search All Missing',
title : 'Search All Missing',
icon : 'icon-search',
callback: this._searchMissing,
ownerContext: this
callback : this._searchMissing,
ownerContext : this,
className : 'x-search-missing'
},
{
title: 'Season Pass',
title : 'Season Pass',
icon : 'icon-bookmark',
route: 'seasonpass'
route : 'seasonpass'
},
{
title: 'Rescan Drone Factory Folder',
title : 'Rescan Drone Factory Folder',
icon : 'icon-refresh',
command: 'downloadedepisodesscan',
properties: {
sendUpdates: true
command : 'downloadedepisodesscan',
properties : {
sendUpdates : true
}
}
]
@ -149,8 +148,7 @@ define(
storeState : false,
menuKey : 'wanted.filterMode',
defaultAction : 'monitored',
items :
[
items : [
{
key : 'monitored',
title : '',
@ -169,42 +167,48 @@ define(
};
this.toolbar.show(new ToolbarLayout({
left :
[
left : [
leftSideButtons
],
right :
[
right : [
filterOptions
],
context: this
context : this
}));
CommandController.bindToCommand({
element: this.$('.x-toolbar-left-1 .btn i.icon-search'),
command: {
name: 'episodeSearch'
element : this.$('.x-search-selected'),
command : {
name : 'episodeSearch'
}
});
CommandController.bindToCommand({
element : this.$('.x-search-missing'),
command : {
name : 'missingEpisodeSearch'
}
});
},
_setFilter: function(buttonContext) {
_setFilter : function (buttonContext) {
var mode = buttonContext.model.get('key');
this.collection.state.currentPage = 1;
var promise = this.collection.setFilterMode(mode);
if (buttonContext)
if (buttonContext) {
buttonContext.ui.icon.spinForPromise(promise);
}
},
_searchSelected: function () {
_searchSelected : function () {
var selected = this.missingGrid.getSelectedModels();
if (selected.length === 0) {
Messenger.show({
type: 'error',
message: 'No episodes selected'
type : 'error',
message : 'No episodes selected'
});
return;
@ -214,18 +218,16 @@ define(
CommandController.Execute('episodeSearch', {
name : 'episodeSearch',
episodeIds: ids
episodeIds : ids
});
},
_searchMissing: function () {
if (window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) +
'One API request to each indexer will be used for each episode. ' +
'This cannot be stopped once started.')) {
_searchMissing : function () {
if (window.confirm('Are you sure you want to search for {0} missing episodes? '.format(this.collection.state.totalRecords) + 'One API request to each indexer will be used for each episode. ' + 'This cannot be stopped once started.')) {
CommandController.Execute('missingEpisodeSearch', {
name : 'missingEpisodeSearch'
});
}
}
});
});
});

Write Preview
Loading…
Cancel
Save