test for string '0' in boolean value as well

[scpubgit/stemmatology.git] / stemmaweb / root / js / relationship.js

diff --git a/stemmaweb/root/js/relationship.js b/stemmaweb/root/js/relationship.js
index ed43d5d..807b5d4 100644 (file)
--- a/stemmaweb/root/js/relationship.js
+++ b/stemmaweb/root/js/relationship.js
@@ -137,7 +137,7 @@ function color_inactive ( el ) {
        // otherwise color it green.
        $(el).attr( {stroke:'green', fill:'#b3f36d'} );
        $.each( reading_info['lexemes'], function ( idx, lex ) {
-               if( !lex['is_disambiguated'] ) {
+               if( !lex['is_disambiguated'] || lex['is_disambiguated'] == 0 ) {
                        $(el).attr( {stroke:'orange', fill:'#fee233'} );
                }
        });
@@ -145,6 +145,7 @@ function color_inactive ( el ) {
 
 function relemmatize () {
        // Send the reading for a new lemmatization and reopen the form.
+       $('#relemmatize_pending').show();
        var reading_id = $('#reading_id').val()
        ncpath = getReadingURL( reading_id );
        form_values = { 
@@ -160,6 +161,7 @@ function relemmatize () {
                } else {
                        alert("Could not relemmatize as requested: " + data['error']);
                }
+               $('#relemmatize_pending').hide();
        });
 }
 
@@ -645,11 +647,11 @@ $(document).ready(function () {
     width: 290,
     modal: true,
     buttons: {
-      "Ok": function() {
+      "Ok": function( evt ) {
+       $(evt.target).button("disable");
         $('#status').empty();
         form_values = $('#collapse_node_form').serialize();
         ncpath = getTextURL( 'relationships' );
-        $(':button :contains("Ok")').attr("disabled", true);
         var jqjson = $.post( ncpath, form_values, function(data) {
             $.each( data, function(item, source_target) { 
                var source_found = get_ellipse( source_target[0] );
@@ -661,7 +663,8 @@ $(document).ready(function () {
                                        relation.data( 'note', $('#note').val()  );
                                        relation_manager.toggle_active( relation.attr('id') );
                                }
-            });
+                               $(evt.target).button("enable");
+           });
             $( "#dialog-form" ).dialog( "close" );
         }, 'json' );
       },
@@ -703,6 +706,7 @@ $(document).ready(function () {
        && ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
          var errobj = jQuery.parseJSON( jqXHR.responseText );
           $('#status').append( '<p class="error">Error: ' + errobj.error + '</br>The relationship cannot be made.</p>' );
+                 $(event.target).parent().find('.ui-button').button("enable");
       }
   } );
 
@@ -754,7 +758,9 @@ $(document).ready(function () {
                Cancel: function() {
                        $( this ).dialog( "close" );
                },
-               Update: function() {
+               Update: function( evt ) {
+                       // Disable the button
+                       $(evt.target).button("disable");
                        $('#reading_status').empty();
                        var reading_id = $('#reading_id').val()
                        form_values = {
@@ -771,7 +777,7 @@ $(document).ready(function () {
                        // Make the JSON call
                        ncpath = getReadingURL( reading_id );
                        var reading_element = readingdata[reading_id];
-                       $(':button :contains("Update")').attr("disabled", true);
+                       // $(':button :contains("Update")').attr("disabled", true);
                        var jqjson = $.post( ncpath, form_values, function(data) {
                                $.each( data, function(key, value) { 
                                        reading_element[key] = value;
@@ -779,6 +785,7 @@ $(document).ready(function () {
                                if( $('#update_workspace_button').data('locked') == false ) {
                                        color_inactive( get_ellipse( reading_id ) );
                                }
+                               $(evt.target).button("enable");
                                $( "#reading-form" ).dialog( "close" );
                        });
                        // Re-color the node if necessary
@@ -803,6 +810,7 @@ $(document).ready(function () {
        && ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
          var errobj = jQuery.parseJSON( jqXHR.responseText );
           $('#reading_status').append( '<p class="error">Error: ' + errobj.error + '</p>' );
+                 $(event.target).parent().find('.ui-button').button("enable");
       }
   });