135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for jQuery 1.9 change in attr() handling

Browse Source
This commit is contained in:
Oliver Gorwits
2013-04-22 22:24:34 +01:00
parent 45a2f05b26
commit e77affd7a1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/share/views/js/search.js
View File

@@ -9,7 +9,7 @@
// if any field in Device Search Options has content, highlight in green // if any field in Device Search Options has content, highlight in green
// and strikethrough the navbar search // and strikethrough the navbar search
function device_form_state(e) { function device_form_state(e) {
if (e.is('[value!=""]')) { if (e.prop('value') != "") {
if (e.attr('type') == 'text') { if (e.attr('type') == 'text') {
$('.field_copy_icon').hide(); $('.field_copy_icon').hide();
} }
@@ -25,7 +25,7 @@
var id = '#' + e.attr('name') + '_clear_btn'; var id = '#' + e.attr('name') + '_clear_btn';
$(id).hide(); $(id).hide();
if (! d_inputs.is('[value!=""]') ) { if (! d_inputs.val() ) {
$('#nq').css('text-decoration', 'none'); $('#nq').css('text-decoration', 'none');
$('.field_copy_icon').show(); $('.field_copy_icon').show();
} }

1
Netdisco/share/views/layouts/main.tt
View File

@@ -12,6 +12,7 @@
<![endif]--> <![endif]-->
<script type="text/javascript" src="[% uri_base %]/javascripts/jquery-latest.min.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/jquery-latest.min.js"></script>
<!-- <script type="text/javascript" src="http://code.jquery.com/jquery-migrate-1.1.1.js"></script> -->
<script type="text/javascript" src="[% uri_base %]/javascripts/jquery-history.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/jquery-history.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/jquery-deserialize.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/jquery-deserialize.js"></script>
<script type="text/javascript" src="[% uri_base %]/javascripts/bootstrap.min.js"></script> <script type="text/javascript" src="[% uri_base %]/javascripts/bootstrap.min.js"></script>