1
0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-12 11:02:21 -05:00

Merge pull request #299 from delphiactual/dev

Pushbullet Changes
This commit is contained in:
echel0n 2014-05-02 03:12:43 -07:00
commit 9b5cfbb731
2 changed files with 3 additions and 3 deletions

View File

@ -983,7 +983,7 @@
</label>
</div>
<div class="testNotification" id="testPushbullet-result">Click below to test.</div>
<input type="button" class="btn" value="Test Pushbullet." id="testPushbullet" />
<input type="button" class="btn" value="Test Pushbullet" id="testPushbullet" />
<input type="submit" class="btn config_submitter" value="Save Changes" />
</div><!-- /content_use_pushbullet //-->

View File

@ -261,9 +261,9 @@ $(document).ready(function(){
$("#pushbullet_device_list").html('');
for (var i = 0; i < devices.length; i++) {
if(current_pushbullet_device == devices[i].iden) {
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'" selected>' + devices[i].extras.model + '</option>')
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'" selected>' + devices[i].extras.nickname + '</option>')
} else {
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'">' + devices[i].extras.model + '</option>')
$("#pushbullet_device_list").append('<option value="'+devices[i].iden+'">' + devices[i].extras.nickname + '</option>')
}
}
if(msg) {