X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=root%2Fjs%2Frelationship.js;h=e822d70846d717dff217e35738a9dc95e62290b5;hb=f6516f222feb909cd3999fc0ca29ac90311a0266;hp=0f18f8673ab486aeed27c9c6947c8ed30610d4cf;hpb=c1add77704413310f34dcf5ce6f5cdf1011bae31;p=scpubgit%2Fstemmaweb.git
diff --git a/root/js/relationship.js b/root/js/relationship.js
index 0f18f86..e822d70 100644
--- a/root/js/relationship.js
+++ b/root/js/relationship.js
@@ -5,6 +5,17 @@ var start_element_height = 0;
var reltypes = {};
var readingdata = {};
+function arrayUnique(array) {
+ var a = array.concat();
+ for(var i=0; i
scope: ' + relation.data( 'scope' );
+ $('#delete_relation_type').text( relation.data('type') );
+ $('#delete_relation_scope').text( relation.data('scope') );
if( relation.data( 'note' ) ) {
- htmlstr = htmlstr + '
note: ' + relation.data( 'note' );
+ $('#delete_relation_note').text('note: ' + relation.data( 'note' ) );
}
- $('#delete-form-text').html( htmlstr );
var points = relation.children('path').attr('d').slice(1).replace('C',' ').split(' ');
var xs = parseFloat( points[0].split(',')[0] );
var xe = parseFloat( points[1].split(',')[0] );
@@ -583,33 +606,40 @@ function Marquee() {
var self = this;
+ this.x = 0;
+ this.y = 0;
+ this.dx = 0;
+ this.dy = 0;
this.enlargementOffset = $('#svgenlargement').offset();
this.svg_rect = $('#svgenlargement svg').svg('get');
this.show = function( event ) {
// TODO: uncolor possible selected
// TODO: unless SHIFT?
+ self.x = event.clientX;
+ self.y = event.clientY;
p = svg_root.createSVGPoint();
p.x = event.clientX - self.enlargementOffset.left;
p.y = event.clientY - self.enlargementOffset.top;
- // NB: I think next line is officially needed, it's only
- // coincidentally that viewport and svg scale 1 to 1 initially
- // and therefor we don't need a transform?
- // p.matrixTransform( svg_root_element.getCTM().inverse() );
self.svg_rect.rect( p.x, p.y, 0, 0, { fill: 'black', 'fill-opacity': '0.1', stroke: 'black', 'stroke-dasharray': '4,2', strokeWidth: '0.02em', id: 'marquee' } );
};
this.expand = function( event ) {
+ self.dx = (event.clientX - self.x);
+ self.dy = (event.clientY - self.y);
var rect = $('#marquee');
- if( rect.length != 0 ) {
- var pX = (event.clientX - self.enlargementOffset.left) - rect.attr("x");;
- var pY = (event.clientY - self.enlargementOffset.top) - rect.attr("y");;
- rect.attr("width", pX);
- rect.attr("height", pY);
+ if( rect.length != 0 ) {
+ var rect_w = Math.abs( self.dx );
+ var rect_h = Math.abs( self.dy );
+ var rect_x = self.x - self.enlargementOffset.left;
+ var rect_y = self.y - self.enlargementOffset.top;
+ if( self.dx < 0 ) { rect_x = rect_x - rect_w }
+ if( self.dy < 0 ) { rect_y = rect_y - rect_h }
+ rect.attr("x", rect_x).attr("y", rect_y).attr("width", rect_w).attr("height", rect_h);
}
};
- this.hide = function() {
+ this.select = function() {
var rect = $('#marquee');
if( rect.length != 0 ) {
var left = $('#marquee').offset().left;
@@ -626,6 +656,7 @@ function Marquee() {
p.y=bottom;
var cx_max = p.matrixTransform(tf).x;
var cy_max = p.matrixTransform(tf).y;
+ var witnesses = [];
$('#svgenlargement ellipse').each( function( index ) {
var cx = parseInt( $(this).attr('cx') );
var cy = parseInt( $(this).attr('cy') );
@@ -633,14 +664,25 @@ function Marquee() {
if( cy > cy_min && cy < cy_max) {
// we actually heve no real 'selected' state for nodes, except coloring
$(this).attr( 'fill', '#ffccff' );
+ var this_witnesses = $(this).data( 'node_obj' ).get_witnesses();
+ witnesses = arrayUnique( witnesses.concat( this_witnesses ) );
}
}
});
- // select here
+ if( $('ellipse[fill="#ffccff"]').size() > 0 ) {
+ $.each( witnesses, function( index, value ) {
+ $('#multipleselect-form').append( '' + value + '
' );
+ });
+ $('#multipleselect-form').dialog( 'open' );
+ }
self.svg_rect.remove( $('#marquee') );
}
};
+ this.unselect = function() {
+ $('ellipse[fill="#ffccff"]').attr( 'fill', '#fff' );
+ }
+
}
@@ -670,7 +712,7 @@ $(document).ready(function () {
event.preventDefault();
return false;
}).mouseup(function (event) {
- marquee.hide();
+ marquee.select();
$(this).data('down', false);
}).mousemove(function (event) {
if( timer != null ) { clearTimeout(timer); }
@@ -750,12 +792,21 @@ $(document).ready(function () {
},
create: function(event, ui) {
$(this).data( 'relation_drawn', false );
+ $('#rel_type').data( 'changed_after_open', false );
$.each( relationship_types, function(index, typedef) {
$('#rel_type').append( $('').attr( "value", typedef.name ).text(typedef.name) );
});
$.each( relationship_scopes, function(index, value) {
$('#scope').append( $('').attr( "value", value ).text(value) );
- });
+ });
+ // Handler to clear the annotation field, the first time the relationship is
+ // changed after opening the form.
+ $('#rel_type').change( function () {
+ if( !$(this).data( 'changed_after_open' ) ) {
+ $('#note').val('');
+ }
+ $(this).data( 'changed_after_open', true );
+ });
},
open: function() {
relation_manager.create_temporary( $('#source_node_id').val(), $('#target_node_id').val() );
@@ -764,6 +815,7 @@ $(document).ready(function () {
$("#dialog_overlay").height( $("#enlargement_container").height() );
$("#dialog_overlay").width( $("#enlargement_container").innerWidth() );
$("#dialog_overlay").offset( $("#enlargement_container").offset() );
+ $('#rel_type').data( 'changed_after_open', false );
},
close: function() {
relation_manager.remove_temporary();
@@ -771,45 +823,44 @@ $(document).ready(function () {
$("#dialog_overlay").hide();
}
}).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) {
- if( ajaxSettings.url == getTextURL('relationships')
- && ajaxSettings.type == 'POST' && jqXHR.status == 403 ) {
- var errobj = jQuery.parseJSON( jqXHR.responseText );
- $('#status').append( '
Error: ' + errobj.error + 'The relationship cannot be made.
' ); - } - $(event.target).parent().find('.ui-button').button("enable"); + if( ajaxSettings.url == getTextURL('relationships') + && ajaxSettings.type == 'POST' && jqXHR.status == 403 ) { + var error; + if( jqXHR.responseText.indexOf('do not have permission to modify') > -1 ) { + error = 'You are not authorized to modify this tradition. (Try logging in again?)'; + } else { + try { + var errobj = jQuery.parseJSON( jqXHR.responseText ); + error = errobj.error + 'The relationship cannot be made.'; + } catch(e) { + error = jqXHR.responseText; + } + } + $('#status').append( 'Error: ' + error ); + } + $(event.target).parent().find('.ui-button').button("enable"); } ); } + var deletion_buttonset = { + cancel: function() { $( this ).dialog( "close" ); }, + global: function () { delete_relation( true ); }, + delete: function() { delete_relation( false ); } + }; + $( "#delete-form" ).dialog({ autoOpen: false, height: 135, - width: 160, + width: 250, modal: false, - buttons: { - Cancel: function() { - $( this ).dialog( "close" ); - }, - Delete: function() { - form_values = $('#delete_relation_form').serialize(); - ncpath = getTextURL( 'relationships' ); - var jqjson = $.ajax({ url: ncpath, data: form_values, success: function(data) { - $.each( data, function(item, source_target) { - relation_manager.remove( get_relation_id( source_target[0], source_target[1] ) ); - }); - $( "#delete-form" ).dialog( "close" ); - }, dataType: 'json', type: 'DELETE' }); - } - }, create: function(event, ui) { - // Swap out the buttons if we are in readonly mode - if( !editable ) { - $( this ).dialog( "option", "buttons", - [{ text: "OK", click: function() { $( this ).dialog( "close" ); }}] ); - } - // TODO What is this logic doing? + // This scales the buttons in the dialog and makes it look proper + // Not sure how essential it is, does anything break if it's not here? var buttonset = $(this).parent().find( '.ui-dialog-buttonset' ).css( 'width', '100%' ); buttonset.find( "button:contains('Cancel')" ).css( 'float', 'right' ); + // A: This makes sure that the pop up delete relation dialogue for a hovered over + // relation auto closes if the user doesn't engage (mouseover) with it. var dialog_aria = $("div[aria-labelledby='ui-dialog-title-delete-form']"); dialog_aria.mouseenter( function() { if( mouseWait != null ) { clearTimeout(mouseWait) }; @@ -819,15 +870,86 @@ $(document).ready(function () { }) }, open: function() { + if( !editable ) { + $( this ).dialog( "option", "buttons", + [{ text: "OK", click: deletion_buttonset['cancel'] }] ); + } else if( $('#delete_relation_scope').text() === 'local' ) { + $( this ).dialog( "option", "width", 160 ); + $( this ).dialog( "option", "buttons", + [{ text: "Delete", click: deletion_buttonset['delete'] }, + { text: "Cancel", click: deletion_buttonset['cancel'] }] ); + } else { + $( this ).dialog( "option", "width", 200 ); + $( this ).dialog( "option", "buttons", + [{ text: "Delete", click: deletion_buttonset['delete'] }, + { text: "Delete all", click: deletion_buttonset['global'] }, + { text: "Cancel", click: deletion_buttonset['cancel'] }] ); + } + mouseWait = setTimeout( function() { $("#delete-form").dialog( "close" ) }, 2000 ); }, - close: function() { - } + close: function() {} + }); + + var multipleselect_buttonset = { + cancel: function() { $( this ).dialog( "close" ); }, + button1: function () { }, + button2: function() { } + }; + + $( "#multipleselect-form" ).dialog({ + autoOpen: false, + height: 150, + width: 250, + modal: true, + create: function(event, ui) { + var buttonset = $(this).parent().find( '.ui-dialog-buttonset' ).css( 'width', '100%' ); + buttonset.find( "button:contains('Cancel')" ).css( 'float', 'right' ); + }, + open: function() { + $( this ).dialog( "option", "width", 200 ); + $( this ).dialog( "option", "buttons", + [{ text: "Button_1", click: multipleselect_buttonset['button1'] }, + { text: "Button_2", click: multipleselect_buttonset['button2'] }, + { text: "Cancel", click: multipleselect_buttonset['cancel'] }] ); + }, + close: function() { marquee.unselect(); } }); + // Helpers for relationship deletion + + function delete_relation( scopewide ) { + form_values = $('#delete_relation_form').serialize(); + if( scopewide ) { + form_values += "&scopewide=true"; + } + ncpath = getTextURL( 'relationships' ); + var jqjson = $.ajax({ url: ncpath, data: form_values, success: function(data) { + $.each( data, function(item, source_target) { + relation_manager.remove( get_relation_id( source_target[0], source_target[1] ) ); + }); + $( "#delete-form" ).dialog( "close" ); + }, dataType: 'json', type: 'DELETE' }); + } + + function toggle_relation_active( node_id ) { + $('#svgenlargement .relation').find( "title:contains('" + node_id + "')" ).each( function(index) { + matchid = new RegExp( "^" + node_id ); + if( $(this).text().match( matchid ) != null ) { + var relation_id = $(this).parent().attr('id'); + relation_manager.toggle_active( relation_id ); + }; + }); + } + // function for reading form dialog should go here; // just hide the element for now if we don't have morphology if( can_morphologize ) { + if( editable ) { + $('#reading_decollate_witnesses').multiselect(); + } else { + $('#decollation').hide(); + } $('#reading-form').dialog({ autoOpen: false, // height: 400, @@ -883,6 +1005,8 @@ $(document).ready(function () { }, open: function() { $(".ui-widget-overlay").css("background", "none"); + $('#reading_decollate_witnesses').multiselect("refresh"); + $('#reading_decollate_witnesses').multiselect("uncheckAll"); $("#dialog_overlay").show(); $('#reading_status').empty(); $("#dialog_overlay").height( $("#enlargement_container").height() ); @@ -894,12 +1018,22 @@ $(document).ready(function () { $("#dialog_overlay").hide(); } }).ajaxError( function(event, jqXHR, ajaxSettings, thrownError) { - if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1 + if( ajaxSettings.url.lastIndexOf( getReadingURL('') ) > -1 && ajaxSettings.type == 'POST' && jqXHR.status == 403 ) { - var errobj = jQuery.parseJSON( jqXHR.responseText ); - $('#reading_status').append( '
Error: ' + errobj.error + '
' ); - } - $(event.target).parent().find('.ui-button').button("enable"); + var error; + if( jqXHR.responseText.indexOf('do not have permission to modify') > -1 ) { + error = 'You are not authorized to modify this tradition. (Try logging in again?)'; + } else { + try { + var errobj = jQuery.parseJSON( jqXHR.responseText ); + error = errobj.error + 'The relationship cannot be made.'; + } catch(e) { + error = jqXHR.responseText; + } + } + $('#status').append( 'Error: ' + error ); + } + $(event.target).parent().find('.ui-button').button("enable"); }); } else { $('#reading-form').hide(); @@ -967,17 +1101,6 @@ $(document).ready(function () { scrollbars:1 }); - - function toggle_relation_active( node_id ) { - $('#svgenlargement .relation').find( "title:contains('" + node_id + "')" ).each( function(index) { - matchid = new RegExp( "^" + node_id ); - if( $(this).text().match( matchid ) != null ) { - var relation_id = $(this).parent().attr('id'); - relation_manager.toggle_active( relation_id ); - }; - }); - } - expandFillPageClients(); $(window).resize(function() { expandFillPageClients();