mirror
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'indexers' 

Fixed indexer validation after merge.
Quality js moved to on() instead of live()
This commit is contained in:
Mark McDowall 2012-02-24 15:27:45 -08:00
parent 1a5b20a48b
commit 991ba4ff0a
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NzbDrone.Web/Content/IndexerSettings.css
View File

@ -4,7 +4,7 @@
margin-left: 15px; margin-left: 15px;
} }
#addItem #addNewznab
{ {
text-decoration: none; text-decoration: none;
font-size: 16px; font-size: 16px;

2
NzbDrone.Web/Content/QualitySettings.css
View File

@ -8,7 +8,7 @@
overflow: auto; overflow: auto;
} }
#addItem #addProfile
{ {
text-decoration: none; text-decoration: none;
font-size:16px; font-size:16px;

10
NzbDrone.Web/Scripts/NzbDrone/qualitySettings.js
View File

@ -1,15 +1,15 @@
var deleteQualityProfileUrl = '../../Settings/DeleteQualityProfile'; var deleteQualityProfileUrl = '../../Settings/DeleteQualityProfile';
$("#addItem").live('click', function () { $(document).on("click", "#addProfile", function (event) {
$.ajax({ $.ajax({
url: this.href, url: this.href,
cache: false, cache: false,
success: function (html) { success: function (html) {
$("#profiles").append(html); $("#profiles").append(html);
} }
}); });
return false;
event.preventDefault();
}); });
function deleteProfile(id) { function deleteProfile(id) {
@ -66,14 +66,14 @@ function getCleanId(obj) {
return parentProfileSection.children('.cleanId').val(); return parentProfileSection.children('.cleanId').val();
} }
$(".profileName_textbox").live('keyup', function () { $(document).on('keyup', '.profileName_textbox', function () {
var value = $(this).val(); var value = $(this).val();
var profileId = getProfileId(this); var profileId = getProfileId(this);
$("#title_" + profileId).text(value); $("#title_" + profileId).text(value);
renameOption(value, profileId); renameOption(value, profileId);
}).keyup(); }).keyup();
$('.quality-selectee').live('click', function () { $(document).on('click', '.quality-selectee', function () {
var id = $(this).attr('id'); var id = $(this).attr('id');
var cleanId = getCleanId(this); var cleanId = getCleanId(this);
var cutoff = '#' + cleanId + '_Cutoff'; var cutoff = '#' + cleanId + '_Cutoff';

7
NzbDrone.Web/Views/Settings/Indexers.cshtml
View File

@ -131,7 +131,7 @@
<br /> <br />
<p> <p>
</p> </p>
<a id="addItem" href="@Url.Action("AddNewznabProvider", "Settings")"> <a id="addNewznab" href="@Url.Action("AddNewznabProvider", "Settings")">
<img src="../../Content/Images/Plus.png" alt="Add Newznab Provider" width="20px" <img src="../../Content/Images/Plus.png" alt="Add Newznab Provider" width="20px"
height="20px" /> height="20px" />
Add Newznab Provider</a> Add Newznab Provider</a>
@ -242,7 +242,7 @@
} }
//Newznab //Newznab
$("#addItem").live('click', function () { $("#addNewznab").on('click', function (event) {
$.ajax({ $.ajax({
url: this.href, url: this.href,
cache: false, cache: false,
@ -250,7 +250,8 @@
$("#newznabProviders").append(html); $("#newznabProviders").append(html);
} }
}); });
return false; event.preventDefault();
//event.stopPropagation();
}); });
var deleteNewznabProviderUrl = '@Url.Action("DeleteNewznabProvider", "Settings")'; var deleteNewznabProviderUrl = '@Url.Action("DeleteNewznabProvider", "Settings")';

2
NzbDrone.Web/Views/Settings/Quality.cshtml
View File

@ -17,7 +17,7 @@
<a href="#">Profiles</a></h3> <a href="#">Profiles</a></h3>
<div id="profileContainer"> <div id="profileContainer">
<div id="profileHeader"> <div id="profileHeader">
<a id="addItem" href="@Url.Action("AddProfile", "Settings")"> <a id="addProfile" href="@Url.Action("AddProfile", "Settings")">
<img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" /> <img src="../../Content/Images/Plus.png" alt="Add New Profile" width="20px" height="20px" />
Add New Profile</a> Add New Profile</a>
</div> </div>