Skip to content
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

Jump to bottom

Sidepanel visibility on canvas focus #1173

Merged
merged 2 commits into from
Nov 7, 2016
Merged

Sidepanel visibility on canvas focus #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
896fa74
Fixes triple click to open side panel when a canvas is focused.
arthurian Nov 7, 2016
a9cdd42
Added unit test setup for side panel.
arthurian Nov 7, 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
7 changes: 0 additions & 7 deletions js/src/widgets/sidePanel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,18 +187,11 @@

render: function(renderingData) {
var _this = this;

if (!this.element) {
this.element = this.appendTo;
jQuery(_this.template(renderingData)).appendTo(_this.appendTo);
return;
}

if (renderingData.open) {
this.appendTo.removeClass('minimized');
} else {
this.appendTo.addClass('minimized');
}
},

template: Handlebars.compile([
Expand Down
42 changes: 37 additions & 5 deletions spec/widgets/sidePanel.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,46 @@
describe('SidePanel', function() {

function createSidePanel(sidePanelOptions) {
sidePanelOptions = sidePanelOptions || {};

var eventEmitter = new Mirador.EventEmitter();
var state = new Mirador.SaveController(jQuery.extend(
true, {}, Mirador.DEFAULT_SETTINGS, {eventEmitter: eventEmitter}
));
var fixture = getJSONFixture('BNF-condorcet-florus-dispersus-manifest.json');
var manifest = new Mirador.Manifest(fixture['@id'], 'IIIF', fixture);
var canvasID = manifest.getCanvases()[0]['@id'];
var appendTo = jQuery('<div class="sidePanel"></div>');

var config = jQuery.extend(true, {
windowId: '380c9e54-7561-4010-a99f-f132f5dc13fd',
state: state,
eventEmitter: eventEmitter,
appendTo: appendTo,
manifest: manifest,
canvasID: canvasID,
layersTabAvailable: false,
tocTabAvailable: false,
annotationsTabAvailable: false,
hasStructures: false
}, sidePanelOptions);

return new Mirador.SidePanel(config);
}

beforeEach(function() {

jasmine.getJSONFixtures().fixturesPath = 'spec/fixtures';
this.sidePanel = createSidePanel();
});

afterEach(function() {

});

xdescribe('Initialization', function() {
describe('Initialization', function() {
it('should initialize', function() {

expect(this.sidePanel instanceof Mirador.SidePanel).toBeTruthy();
expect(this.sidePanel.appendTo).toBeTruthy();
});
});

Expand All @@ -34,8 +64,10 @@ describe('SidePanel', function() {

});

xdescribe('render', function() {

describe('render', function() {
it('should render on initialization', function() {
expect(this.sidePanel.appendTo.html()).toBeTruthy();
});
});

xdescribe('toggle', function() {
Expand Down