From 550cee85c2aea90bfbd1ee89fb97ee7e3aa35dfa Mon Sep 17 00:00:00 2001 From: gusreiber Date: Tue, 22 Mar 2016 12:47:12 -0700 Subject: [PATCH] relative possition for restapi | cssclass attribute fix | fix to order --- .../hudson/model/Job/configure.jelly | 2 +- war/src/main/js/add-item.js | 21 +++---------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly index 96975dada5..876314d3d3 100644 --- a/core/src/main/resources/hudson/model/Job/configure.jelly +++ b/core/src/main/resources/hudson/model/Job/configure.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. --> - + diff --git a/war/src/main/js/add-item.js b/war/src/main/js/add-item.js index 1c5352aed9..1156c1a703 100644 --- a/war/src/main/js/add-item.js +++ b/war/src/main/js/add-item.js @@ -3,7 +3,7 @@ var $ = require('jquery-detached').getJQuery(); var getItems = function(root){ var d = $.Deferred(); - $.get(root+'/categories?depth=3').done( + $.get('categories?depth=3').done( function(data){ d.resolve(data); } @@ -46,8 +46,6 @@ $.when(getItems(jRoot)).done(function(data){ $subBtn = $('#bottom-sticker .yui-submit-button'); - checkFormReady(); - $subBtn.on('click',function(e){ var $this = $(this).addClass('yui-button-disabled yui-submit-button-disabled') .find('button') @@ -106,24 +104,11 @@ $.when(getItems(jRoot)).done(function(data){ return {selected:selected,named:named}; } if(checkItems().selected && checkItems().named){ - $($subBtn.next('.cover')).remove(); $subBtn.removeClass('yui-button-disabled').find('button').removeAttr('disabled'); } else{ $subBtn.addClass('yui-button-disabled').find('button').attr('disabled','disabled'); - $('
').insertAfter($subBtn) - .click(function(){ - var missingText = []; - if(!checkItems().named){ - $name.addClass('no-val').focus(); - missingText.push('item name'); - } - if(!checkItems().selected){ - $form.addClass('no-select'); - missingText.push('item type selection'); - } - alert('Required selections are missing: '+ (missingText.join(', '))); - }); + $('
').insertAfter($subBtn); } },10); } @@ -166,7 +151,7 @@ $.when(getItems(jRoot)).done(function(data){ function sortByOrder(a, b) { var aOrder = a.weight; var bOrder = b.weight; - return ( (aOrder < bOrder) ? -1 : ( (aOrder === bOrder) ? 0 : 1)); + return ( (aOrder < bOrder) ? -1 : ( (aOrder === bOrder) ? 1 : 0)); } return itemTypes.sort(sortByOrder); }