Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #126 from stepstone-tech/master
workaround for JENKINS-48986
  • Loading branch information
felfert committed Feb 22, 2018
2 parents 8d95930 + 2e9fa0d commit c102b4a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
Expand Up @@ -16,10 +16,16 @@ limitations under the License.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
<tr>
<td><f:select field="fileId" clazz="jclouds" default=""/></td>
<td><input type="button" value="${%Show content}" class="jclouds-showcf"
disabled="${empty(instance.fileId)?'true':null}"/></td>
<td><f:repeatableDeleteButton/></td>
</tr>
<div style="display:block;">
<div style="display:inline-block;" >
<f:select field="fileId" clazz="jclouds" default=""/>
</div>
<div style="display:inline-block;" >
<input type="button" value="${%Show content}" class="jclouds-showcf"
disabled="${empty(instance.fileId)?'true':null}"/>
</div>
<div style="display:inline-block;" >
<f:repeatableDeleteButton/>
</div>
</div>
</j:jelly>
4 changes: 2 additions & 2 deletions jclouds-plugin/src/main/webapp/jclouds.js
Expand Up @@ -63,13 +63,13 @@ window.JClouds = window.JClouds || {
},
"showcf": function(evt) {
var but = evt.target || evt.srcElement;
var fid = $(but).up('tr').down('select').getValue();
var fid = $(but).up('div').up('div').down('select').getValue();
evt.stop();
window.JClouds.showdlg(rootURL + '/configfiles/show?id=' + fid, window.JClouds.showcfpost);
},
"chgbutton": function(sel) {
var dis = $(sel).getValue() == '';
var but = $(sel).up('tr').down('.yui-button').yb;
var but = $(sel).up('div').up('div').down('.yui-button').yb;
but.set('disabled', dis, true);
},
"chsel": function(evt) {
Expand Down

0 comments on commit c102b4a

Please sign in to comment.