Skip to content

Made UI display spaces between fragments #1176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
duncanka wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Made UI display spaces between fragments #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82b447a
EOL whitespace cleanup
duncanka May 22, 2016
0d10913
Fixed comment typo
duncanka May 22, 2016
c092402
Made UI correctly show spaces between texts of fragments
duncanka May 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions client/src/annotator_ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var AnnotatorUI = (function($, window, undefined) {
// utility function, originally for stripping numerix suffixes
// from arc types (e.g. "Theme2" -> "Theme"). For values
// without suffixes (including non-strings), returns given value.
if (typeof(s) != "string") {
if (typeof(s) != "string") {
return s; // can't strip
}
var m = s.match(/^(.*?)(\d*)$/);
Expand Down Expand Up @@ -128,7 +128,7 @@ var AnnotatorUI = (function($, window, undefined) {

// in rapid annotation mode, prioritize the keys 0..9 for the
// ordered choices in the quick annotation dialog.
if (Configuration.rapidModeOn && rapidAnnotationDialogVisible &&
if (Configuration.rapidModeOn && rapidAnnotationDialogVisible &&
"0".charCodeAt() <= code && code <= "9".charCodeAt()) {
var idx = String.fromCharCode(code);
var $input = $('#rapid_span_'+idx);
Expand Down Expand Up @@ -362,7 +362,7 @@ var AnnotatorUI = (function($, window, undefined) {
var chunkIndexTo = sel.focusNode && $(sel.focusNode.parentNode).attr('data-chunk-id');
// fallback for firefox (at least):
// it's unclear why, but for firefox the anchor and focus
// node parents are always undefined, the the anchor and
// node parents are always undefined, the anchor and
// focus nodes themselves do (often) have the necessary
// chunk ID. However, anchor offsets are almost always
// wrong, so we'll just make a guess at what the user might
Expand Down Expand Up @@ -602,7 +602,7 @@ var AnnotatorUI = (function($, window, undefined) {
eLeft = Math.min(Math.max(eLeft,0), screenWidth - elementWidth);
} else {
eLeft = 0;
}
}
if (screenHeight > elementHeight) {
eTop = Math.min(Math.max(eTop,0), screenHeight - elementHeight);
} else {
Expand Down Expand Up @@ -672,7 +672,7 @@ var AnnotatorUI = (function($, window, undefined) {
}

$('#span_selected').text(spanText);
var encodedText = encodeURIComponent(spanText);
var encodedText = encodeURIComponent(spanText);
$.each(searchConfig, function(searchNo, search) {
$('#span_'+search[0]).attr('href', search[1].replace('%s', encodedText));
});
Expand Down Expand Up @@ -895,12 +895,12 @@ var AnnotatorUI = (function($, window, undefined) {

showValidAttributes = function() {
var type = $('#span_form input:radio:checked').val();

showAllAttributes = false;

var entityAttrCount = showAttributesFor(entityAttributeTypes, 'entity', type);
var eventAttrCount = showAttributesFor(eventAttributeTypes, 'event', type);

// show attribute frames only if at least one attribute is
// shown, and set size classes appropriately
if (eventAttrCount > 0) {
Expand Down Expand Up @@ -975,7 +975,7 @@ var AnnotatorUI = (function($, window, undefined) {
var $label = $('<label class="span_type_label"/>').
attr('for', 'rapid_span_' + (typeNo+1)).
text(name+' (' + (100.0 * prob).toFixed(1) + '%)');
$label.css('background-color', spanBgColor);
$label.css('background-color', spanBgColor);
// TODO: check for unnecessary extra wrapping here
var $content = $('<div class="item_content"/>').
append($numlabel).
Expand Down Expand Up @@ -1016,7 +1016,7 @@ var AnnotatorUI = (function($, window, undefined) {
});
// fill in some space and the special "Other" option, with key "0" (zero)
$spanTypeDiv.append($('<div class="item_content">&#160;</div>')); // non-breaking space
var $numlabel = $('<span class="accesskey">0</span><span>:</span>');
var $numlabel = $('<span class="accesskey">0</span><span>:</span>');
var $input = $('<input type="radio" name="rapid_span_type" id="rapid_span_0" value=""/>');
var $label = $('<label class="span_type_label" for="rapid_span_0" style="background-color:lightgray">Other...</label>');
var $content = $('<div class="item_content"/>').
Expand Down Expand Up @@ -1074,7 +1074,7 @@ var AnnotatorUI = (function($, window, undefined) {
// TODO: better response to failure
dispatcher.post('messages', [[['Lookup error', 'warning', -1]]]);
return false;
}
}
// set input style according to whether we have a valid value
var $idinput = $('#span_norm_id');
// TODO: make sure the key echo in the response matches the
Expand Down Expand Up @@ -1187,7 +1187,7 @@ var AnnotatorUI = (function($, window, undefined) {
};
var normSearchSubmit = function(evt) {
if (normSearchSubmittable) {
var selectedId = $('#norm_search_id').val();
var selectedId = $('#norm_search_id').val();
var selectedTxt = $('#norm_search_query').val();

normSubmit(selectedId, selectedTxt);
Expand Down Expand Up @@ -1291,7 +1291,7 @@ var AnnotatorUI = (function($, window, undefined) {
}
// blank the table
$('#norm_search_result_select thead').empty();
$('#norm_search_result_select tbody').empty();
$('#norm_search_result_select tbody').empty();
// TODO: support for two (or more) dialogs open at the same time
// so we don't need to hide this before showing normSearchDialog
dispatcher.post('hideForm');
Expand Down Expand Up @@ -1357,7 +1357,7 @@ var AnnotatorUI = (function($, window, undefined) {
// do not allow equiv<->non-equiv change options
if (arcType && isEquiv != isThisEquiv) return;

var displayName = ((arcDesc.labels && arcDesc.labels[0]) ||
var displayName = ((arcDesc.labels && arcDesc.labels[0]) ||
arcTypeName);
var $checkbox = $('<input id="arc_' + arcTypeName + '" type="radio" name="arc_type" value="' + arcTypeName + '"/>');
var $label = $('<label class="arc_type_label" for="arc_' + arcTypeName + '"/>').text(displayName);
Expand Down Expand Up @@ -1581,7 +1581,7 @@ var AnnotatorUI = (function($, window, undefined) {

// fallback for firefox (at least):
// it's unclear why, but for firefox the anchor and focus
// node parents are always undefined, the the anchor and
// node parents are always undefined, the anchor and
// focus nodes themselves do (often) have the necessary
// chunk ID. However, anchor offsets are almost always
// wrong, so we'll just make a guess at what the user might
Expand Down Expand Up @@ -1715,7 +1715,7 @@ var AnnotatorUI = (function($, window, undefined) {
dispatcher.post('logAction', ['spanLockNewSubmitted']);
} else if (!Configuration.rapidModeOn || reselectedSpan != null) {
// normal span select in standard annotation mode
// or reselect: show selector
// or reselect: show selector
var spanText = data.text.substring(selectedFrom, selectedTo);
fillSpanTypesAndDisplayForm(evt, spanText, reselectedSpan);
// for precise timing, log annotation display to user.
Expand All @@ -1729,7 +1729,7 @@ var AnnotatorUI = (function($, window, undefined) {
// but this is clumsy and suboptimal (user may have scrolled
// during the ajax invocation); think of a better way.
lastRapidAnnotationEvent = evt;
dispatcher.post('ajax', [ {
dispatcher.post('ajax', [ {
action: 'suggestSpanTypes',
collection: coll,
'document': doc,
Expand All @@ -1740,7 +1740,7 @@ var AnnotatorUI = (function($, window, undefined) {
}, 'suggestedSpanTypes']);
}
}
};
};

var onMouseUp = function(evt) {
if (that.user === null) return;
Expand Down Expand Up @@ -1932,10 +1932,10 @@ var AnnotatorUI = (function($, window, undefined) {
} else if (attr.bool) {
var escapedName = Util.escapeQuotes(attr.name);
var $input = $('<input type="checkbox" id="'+attrId+
'" value="' + escapedType +
'" value="' + escapedType +
'" category="' + category + '"/>');
var $label = $('<label for="'+attrId+
'" data-bare="' + escapedName + '">&#x2610; ' +
'" data-bare="' + escapedName + '">&#x2610; ' +
escapedName + '</label>');
$span.append($input).append($label);
$input.button();
Expand Down Expand Up @@ -1963,7 +1963,7 @@ var AnnotatorUI = (function($, window, undefined) {
// disable not only categories of types (events or entities),
// but the specific set of types that are incompatible with
// the current attribute settings.

// just assume all attributes are event attributes
// TODO: support for entity attributes
// TODO2: the above comment is almost certainly false, check and remove
Expand Down Expand Up @@ -2255,7 +2255,7 @@ var AnnotatorUI = (function($, window, undefined) {
return attributes;
}

var spanAndAttributeTypesLoaded = function(_spanTypes,
var spanAndAttributeTypesLoaded = function(_spanTypes,
_entityAttributeTypes,
_eventAttributeTypes,
_relationTypesHash) {
Expand Down Expand Up @@ -2315,7 +2315,7 @@ var AnnotatorUI = (function($, window, undefined) {
// TODO: why are these globals defined here instead of at the top?
var spanForm = $('#span_form');
var rapidSpanForm = $('#rapid_span_form');

var deleteSpan = function() {
if (Configuration.confirmModeOn && !confirm("Are you sure you want to delete this annotation?")) {
return;
Expand Down Expand Up @@ -2380,7 +2380,7 @@ var AnnotatorUI = (function($, window, undefined) {
$roles.append($role).append($label);
});
var $roleButtons = $roles.find('input').button();

dispatcher.post('showForm', [splitForm]);
};

Expand Down Expand Up @@ -2503,7 +2503,7 @@ var AnnotatorUI = (function($, window, undefined) {

dispatcher.post('initForm', [rapidSpanForm, {
alsoResize: '#rapid_span_types',
width: 400,
width: 400,
close: function(evt) {
keymap = null;
}
Expand Down
8 changes: 4 additions & 4 deletions client/src/visualizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ var Visualizer = (function($, window, undefined) {
for (var fi = 0, nfi = 0; fi < this.unsegmentedOffsets.length; fi++) {
var begin = this.unsegmentedOffsets[fi][0];
var end = this.unsegmentedOffsets[fi][1];

for (var ti = begin; ti < end; ti++) {
var c = text.charAt(ti);
if (c == '\n' || c == '\r') {
Expand All @@ -101,7 +101,7 @@ var Visualizer = (function($, window, undefined) {
begin = ti;
}
}

if (begin !== null) {
this.offsets.push([begin, end]);
this.segmentedOffsetsMap[nfi++] = fi;
Expand Down Expand Up @@ -894,7 +894,7 @@ var Visualizer = (function($, window, undefined) {
// TODO heuristics
fragmentTexts.push(fragment.text);
});
span.text = fragmentTexts.join('');
span.text = fragmentTexts.join(' ');
}); // data.spans

for (var i = 0; i < 2; i++) {
Expand Down Expand Up @@ -3207,7 +3207,7 @@ Util.profileStart('before render');
aType.bool = aType.values[0].name;
}
// We need attribute values to be stored as an array, in the correct order,
// but for efficiency of access later we also create a map of each value
// but for efficiency of access later we also create a map of each value
// name to the corresponding value dictionary.
aType.values.byName = {}
$.each(aType.values, function(valueNo, val) {
Expand Down