Merge pull request #1173 from Harvard-ATG/bugfix/sidepanel-visibility

Sidepanel visibility on canvas focus
ProjectMirador · Nov 7, 2016 · 3280dd3 · 3280dd3
2 parents 01101de + a9cdd42
commit 3280dd3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 12 deletions.
diff --git a/js/src/widgets/sidePanel.js b/js/src/widgets/sidePanel.js
@@ -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([

diff --git a/spec/widgets/sidePanel.test.js b/spec/widgets/sidePanel.test.js
@@ -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();
     });
   });
 
@@ -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() {