beenull/Heimdall
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #207 from MindTooth/fix_app_js

Browse source 
Fix issue with using override_url and running a test
This commit is contained in:
KodeStar 2018-06-13 22:39:44 +01:00 committed by GitHub
parent 223e9289dc 3f19882df8
commit 24ac12da65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 54 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
resources/assets/js/app.js
View file

@ -44,13 +44,13 @@ $.when( $.ready ).then(function() {
reader.onload = function(e) { reader.onload = function(e) {
$('#appimage img').attr('src', e.target.result); $('#appimage img').attr('src', e.target.result);
} };
reader.readAsDataURL(input.files[0]); reader.readAsDataURL(input.files[0]);
} }
} }
$("#upload").change(function() { $('#upload').change(function() {
readURL(this); readURL(this);
}); });
/*$(".droppable").droppable({ /*$(".droppable").droppable({
@ -70,9 +70,9 @@ $.when( $.ready ).then(function() {
} }
});*/ });*/
$( "#sortable" ).sortable({ $( '#sortable' ).sortable({
stop: function (event, ui) { stop: function (event, ui) {
var idsInOrder = $("#sortable").sortable('toArray', { var idsInOrder = $('#sortable').sortable('toArray', {
attribute: 'data-id' attribute: 'data-id'
}); });
$.post( $.post(
@ -82,7 +82,7 @@ $.when( $.ready ).then(function() {
} }
}); });
$("#sortable").sortable("disable"); $('#sortable').sortable('disable');
@ -95,12 +95,10 @@ $.when( $.ready ).then(function() {
$('.add-item').hide(); $('.add-item').hide();
$('.item-edit').hide(); $('.item-edit').hide();
$('#app').removeClass('sidebar'); $('#app').removeClass('sidebar');
$("#sortable").sortable("disable") $('#sortable').sortable('disable');
} else { } else {
$("#sortable").sortable("enable") $('#sortable').sortable('enable');
setTimeout( setTimeout(function() {
function()
{
$('.add-item').fadeIn(); $('.add-item').fadeIn();
$('.item-edit').fadeIn(); $('.item-edit').fadeIn();
}, 350); }, 350);
@ -121,24 +119,21 @@ $.when( $.ready ).then(function() {
e.preventDefault(); e.preventDefault();
var apiurl = $('#create input[name=url]').val(); var apiurl = $('#create input[name=url]').val();
var override_url = $('#create input[name="config[override_url]"').val();
var override_url = $('#override_url'); if(override_url.length && override_url != '') {
if(override_url.length && override_url.val() != '') {
apiurl = override_url; apiurl = override_url;
} }
var data = {}; var data = {};
data['url'] = apiurl; data['url'] = apiurl;
$('input.config-item').each(function(index){ $('input.config-item').each(function(index){
var config = $(this).data('config'); var config = $(this).data('config');
data[config] = $(this).val(); data[config] = $(this).val();
}) });
$.post( $.post('/test_config', { data }, function(data) {
'/test_config',
{ data }, function(data) {
alert(data); alert(data);
} });
);
}); });
$('#pinlist').on('click', 'a', function(e) { $('#pinlist').on('click', 'a', function(e) {