fuwafuwa
/
etherpad-lite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[fix] Close modals when user clicks both on pad inner and outer 

Also: split tests for automatic reconnection and regular modal tests.
This commit is contained in:
Luiza Pagliari 2017-05-04 11:22:18 -03:00
parent 0bd4169663
commit 4eec3763b4
3 changed files with 72 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/static/js/ace2_inner.js
View File

@ -3367,7 +3367,12 @@ function Ace2Inner(){
evt.preventDefault();
}
}
//hide the dropdownso
hideEditBarDropdowns();
}
function hideEditBarDropdowns()
{
if(window.parent.parent.padeditbar){ // required in case its in an iframe should probably use parent.. See Issue 327 https://github.com/ether/etherpad-lite/issues/327
window.parent.parent.padeditbar.toggleDropDown("none");
}
@ -4983,6 +4988,8 @@ function Ace2Inner(){
$(document).on("keypress", handleKeyEvent);
$(document).on("keyup", handleKeyEvent);
$(document).on("click", handleClick);
// dropdowns on edit bar need to be closed on clicks on both pad inner and pad outer
$(outerWin.document).on("click", hideEditBarDropdowns);
// Disabled: https://github.com/ether/etherpad-lite/issues/2546
// Will break OL re-numbering: https://github.com/ether/etherpad-lite/pull/2533
// $(document).on("cut", handleCut);

13
tests/frontend/specs/automatic_reconnect.js
View File

@ -33,19 +33,6 @@ describe('Automatic pad reload on Force Reconnect message', function() {
done();
});
it('disables editor', function(done) {
var editorDocument = helper.padOuter$("iframe[name='ace_inner']").get(0).contentDocument;
var editorBody = editorDocument.getElementById('innerdocbody');
var editorIsEditable = editorBody.contentEditable === 'false' // IE/Safari
|| editorDocument.designMode === 'off'; // other browsers
expect(editorIsEditable).to.be(true);
done();
});
context('and user clicks on Cancel', function() {
beforeEach(function() {
var $errorMessageModal = helper.padChrome$('#connectivity .userdup');

64
tests/frontend/specs/pad_modal.js Normal file
View File

@ -0,0 +1,64 @@
describe('Pad modal', function() {
var padId, $originalPadFrame;
beforeEach(function(done) {
padId = helper.newPad(function() {
// open same pad on another iframe, to force userdup error
var $otherIframeWithSamePad = $('<iframe src="/p/' + padId + '" style="height: 1px;"></iframe>');
$originalPadFrame = $('#iframe-container iframe');
$otherIframeWithSamePad.insertAfter($originalPadFrame);
// wait for modal to be displayed
var $errorMessageModal = helper.padChrome$('#connectivity .userdup');
helper.waitFor(function() {
return $errorMessageModal.is(':visible');
}, 50000).done(done);
});
this.timeout(60000);
});
it('disables editor', function(done) {
var editorDocument = helper.padOuter$("iframe[name='ace_inner']").get(0).contentDocument;
var editorBody = editorDocument.getElementById('innerdocbody');
var editorIsEditable = editorBody.contentEditable === 'false' // IE/Safari
|| editorDocument.designMode === 'off'; // other browsers
expect(editorIsEditable).to.be(true);
done();
});
context('and user clicks on editor', function() {
beforeEach(function() {
var $editor = helper.padInner$('#innerdocbody');
$editor.click();
});
it('closes the modal', function(done) {
var $errorMessageModal = helper.padChrome$('#connectivity .userdup');
var modalIsVisible = $errorMessageModal.is(':visible');
expect(modalIsVisible).to.be(false);
done();
});
});
context('and user clicks on pad outer', function() {
beforeEach(function() {
var $lineNumbersColumn = helper.padOuter$('#sidedivinner');
$lineNumbersColumn.click();
});
it('closes the modal', function(done) {
var $errorMessageModal = helper.padChrome$('#connectivity .userdup');
var modalIsVisible = $errorMessageModal.is(':visible');
expect(modalIsVisible).to.be(false);
done();
});
});
});