From 85934c1b210b6a46dd9f19811520fae84c75b9b1 Mon Sep 17 00:00:00 2001
From: Johannes Baiter <johannes.baiter@bsb-muenchen.de>
Date: Mon, 22 May 2017 13:55:11 +0200
Subject: [PATCH 01/30] Fix language detection for IE11

---
 js/src/utils/jsonLd.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/utils/jsonLd.js b/js/src/utils/jsonLd.js
index 8ce2befc6c..f40ca67574 100644
--- a/js/src/utils/jsonLd.js
+++ b/js/src/utils/jsonLd.js
@@ -34,7 +34,7 @@
 
   $.JsonLd = {
     getTextValue: function(propertyValue, language) {
-      var languages = window.navigator.languages || ['en'];
+      var languages = i18next.languages || ['en'];
       if (typeof language === 'string') {
         languages = [language].concat(languages);
       } else if (Array.isArray(language)) {

From a64fe17f4cd65d09c7abe333abc5766cde387cb2 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Fri, 2 Jun 2017 10:48:22 +0200
Subject: [PATCH 02/30] Add testcases for the default window buttons

---
 spec/workspaces/window.test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spec/workspaces/window.test.js b/spec/workspaces/window.test.js
index 62eb4dcc8f..a5aadd13cc 100644
--- a/spec/workspaces/window.test.js
+++ b/spec/workspaces/window.test.js
@@ -147,6 +147,12 @@ describe('Window', function() {
         expect(calls.first().args[0].appendTo.is(this.appendTo.find('.view-container'))).toBe(true);
       });
 
+      it('should place default buttons in DOM', function(){
+        expect(this.appendTo.find('.mirador-icon-view-type')).toExist();
+        expect(this.appendTo.find('.mirador-icon-metadata-view')).toExist();
+        expect(this.appendTo.find('.mirador-osd-fullscreen')).toExist();
+      });
+
       it('should place user buttons in DOM', function(){
         expect(this.appendTo.find('.mirador-icon-text')).toExist();
         expect(this.appendTo.find('.mirador-icon-text').attr('href')).toBe('http://example.com');

From 43860685a22c2a646e754434f21475530c4ccb3a Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Fri, 2 Jun 2017 12:02:46 +0200
Subject: [PATCH 03/30] Make the language of the UI configurable

---
 js/src/viewer.js | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/js/src/viewer.js b/js/src/viewer.js
index 3b7009fae0..039fa5a77b 100644
--- a/js/src/viewer.js
+++ b/js/src/viewer.js
@@ -43,15 +43,27 @@
     init: function() {
       var _this = this;
 
-      //initialize i18next
-      i18next.use(i18nextXHRBackend).use(i18nextBrowserLanguageDetector).init({
+      // i18next options
+      var i18nextOptions = {
         fallbackLng: 'en',
         load: 'unspecific',
         debug: false,
         backend: {
           loadPath: _this.state.getStateProperty('buildPath') + _this.state.getStateProperty('i18nPath')+'{{lng}}/{{ns}}.json'
         }
-      }, _this.setupViewer.bind(_this));
+      };
+
+      // set the language from configuration
+      var configuredLanguage = _this.state.getStateProperty('language');
+      if(configuredLanguage){
+        i18nextOptions.lng = configuredLanguage;
+      }
+
+      //initialize i18next
+      i18next.use(i18nextXHRBackend).use(i18nextBrowserLanguageDetector).init(
+        i18nextOptions,
+        _this.setupViewer.bind(_this)
+      );
       // because this is a callback, we need to bind "_this" to explicitly retain the calling context of this function (the viewer object instance));
     },
 

From 96b3df2da09df2b197dbc0fc4713e6cfe9da7647 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Fri, 2 Jun 2017 12:03:21 +0200
Subject: [PATCH 04/30] Add testcase for configured language

---
 spec/mirador.test.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/mirador.test.js b/spec/mirador.test.js
index e388e43945..8c62ad78eb 100644
--- a/spec/mirador.test.js
+++ b/spec/mirador.test.js
@@ -20,7 +20,8 @@ describe('Mirador | mirador.js', function() {
         "manifestUri": "spec/data/manifest2.json",
         "location": "Stanford University",
         "title": "Walters"
-      }]
+      }],
+      language: "de"
     });
 
     testContext.mirador.viewer.eventEmitter.subscribe('manifestListItemRendered', function(data) {
@@ -57,6 +58,10 @@ describe('Mirador | mirador.js', function() {
       expect(this.mirador.viewer).toBeDefined();
     });
 
+    it('should set the configured language', function(){
+      expect(i18next.language).toBe('de')
+    });
+
     it('should select a manifest', function() {
       expect(this.viewerDiv.find('.addItemLink').first()).toExist();
       this.viewerDiv.find('.addItemLink').first().click();

From ab5a5b78c52034b0a25e36bd308792d24e60d390 Mon Sep 17 00:00:00 2001
From: Javier de la Rosa <versae@gmail.com>
Date: Mon, 8 May 2017 15:39:54 -0700
Subject: [PATCH 05/30] Fixes #1259. Adding support for tags coming from the
 config, and freely-added tags.

---
 Gruntfile.js                                  |  2 +
 css/less/overrides/qtip.less                  |  9 +-
 .../annotations/tinymce-annotation-editor.js  | 54 +++++++-----
 package.json                                  |  1 +
 .../tinymce-annotation-editor.test.js         | 87 +++++++++++++++++--
 5 files changed, 122 insertions(+), 31 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index a3a9c09bfe..49958af1a8 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -49,6 +49,7 @@ module.exports = function(grunt) {
     'js/lib/sanitize-html.min.js',
     'node_modules/iiif-evented-canvas/dist/iiif-evented-canvas.umd.min.js',
     'node_modules/iiif-layout-functions/dist/iiif-layout-functions.umd.min.js',
+    'node_modules/select2/dist/js/select2.full.min.js'
   ],
 
   // source files
@@ -96,6 +97,7 @@ module.exports = function(grunt) {
           'css/jquery-ui.min.css',
           'css/jquery.qtip.min.css',
           'node_modules/spectrum-colorpicker/spectrum.css',
+          'node_modules/select2/dist/css/select2.min.css',
           'css/mirador.css',
           'css/material-icons.css',
           'bower_components/simplePagination.js/simplePagination.css'
diff --git a/css/less/overrides/qtip.less b/css/less/overrides/qtip.less
index 5e24f49161..8983ce5e05 100644
--- a/css/less/overrides/qtip.less
+++ b/css/less/overrides/qtip.less
@@ -68,7 +68,7 @@
     /* background-color: black; */
   }
 
-  .text-editor, .tags-editor {
+  .text-editor, .tags-editor, .select2-container {
     padding: 5px;
     display: block;
     margin: 6px 0px 6px 0px;
@@ -77,6 +77,13 @@
     box-shadow: inset 0 0 7px @gray;
     resize: vertical;
     border: 1px solid @gray;
+    width: 200px;
+
+    .select2-selection--multiple {
+      border: none;
+      background-color: inherit;
+      font-size: 16px;
+    }
   }
 
   .annotation-display.annotation-tooltip .button-container {
diff --git a/js/src/annotations/tinymce-annotation-editor.js b/js/src/annotations/tinymce-annotation-editor.js
index 274f56026f..9dfee008b0 100644
--- a/js/src/annotations/tinymce-annotation-editor.js
+++ b/js/src/annotations/tinymce-annotation-editor.js
@@ -7,7 +7,8 @@
       windowId: null,
       config: {
         plugins: '',
-        toolbar: ''
+        toolbar: '',
+        tags: []
       }
     }, options);
 
@@ -18,13 +19,13 @@
     init: function() {
       var _this = this;
       var annoText = "",
+        selectedTags = [],
         tags = [];
-
       if (!jQuery.isEmptyObject(_this.annotation)) {
         if (jQuery.isArray(_this.annotation.resource)) {
           jQuery.each(_this.annotation.resource, function(index, value) {
             if (value['@type'] === "oa:Tag") {
-              tags.push(value.chars);
+              selectedTags.push(value.chars);
             } else {
               annoText = value.chars;
             }
@@ -33,10 +34,17 @@
           annoText = _this.annotation.resource.chars;
         }
       }
+      (this.config.tags || []).forEach(function(item) {
+        if (selectedTags.indexOf(item) < 0) {
+          tags.push(item);
+        }
+      });
+      tags = tags.concat(selectedTags);
 
       this.editorMarkup = this.editorTemplate({
         content: annoText,
-        tags : tags.join(" "),
+        selectedTags : selectedTags,
+        tags: tags,
         windowId : _this.windowId
       });
     },
@@ -55,6 +63,11 @@
         setup: function(editor) {
           editor.on('init', function(args) {
             tinymce.execCommand('mceFocus', false, args.target.id);
+            jQuery('.tags-editor').select2({
+              tags: true,
+              placeholder: "Add tags here..."
+              // tokenSeparators: [',', ' ']  // spaces for backward compatibility
+            });
           });
         }
       });
@@ -65,13 +78,8 @@
     },
 
     createAnnotation: function() {
-      var tagText = this.editorContainer.find('.tags-editor').val(),
-        resourceText = tinymce.activeEditor.getContent(),
-        tags = [];
-      tagText = $.trimString(tagText);
-      if (tagText) {
-        tags = tagText.split(/\s+/);
-      }
+      var tags = this.editorContainer.find('.tags-editor').val(),
+        resourceText = tinymce.activeEditor.getContent();
 
       var motivation = [],
         resource = [],
@@ -101,13 +109,8 @@
     },
 
     updateAnnotation: function(oaAnno) {
-      var tagText = this.editorContainer.find('.tags-editor').val(),
-        resourceText = tinymce.activeEditor.getContent(),
-        tags = [];
-      tagText = $.trimString(tagText);
-      if (tagText) {
-        tags = tagText.split(/\s+/);
-      }
+      var selectedTags = this.editorContainer.find('.tags-editor').val(),
+        resourceText = tinymce.activeEditor.getContent();
 
       var motivation = [],
         resource = [];
@@ -120,9 +123,9 @@
         return value["@type"] !== "oa:Tag";
       });
       //re-add tagging if we have them
-      if (tags.length > 0) {
+      if (selectedTags.length > 0) {
         oaAnno.motivation.push("oa:tagging");
-        jQuery.each(tags, function(index, value) {
+        jQuery.each(selectedTags, function(index, value) {
           oaAnno.resource.push({
             "@type": "oa:Tag",
             "chars": value
@@ -138,7 +141,16 @@
 
     editorTemplate: $.Handlebars.compile([
       '<textarea class="text-editor" placeholder="{{t "comments"}}…">{{#if content}}{{content}}{{/if}}</textarea>',
-      '<input id="tags-editor-{{windowId}}" class="tags-editor" placeholder="{{t "addTagsHere"}}…" {{#if tags}}value="{{tags}}"{{/if}}>'
+      '<select id="tags-editor-{{windowId}}" class="tags-editor" multiple="true">{{#each tags}}',
+      '<option value="{{this}}" {{#ifContains ../selectedTags this }}selected="selected"{{/ifContains}}>{{this}}</option>',
+      '{{/each}}</select>'
     ].join(''))
   };
+
+  // Handlebars helper: Contains
+  // check if a value is contained in an array
+  $.Handlebars.registerHelper("ifContains", function( array, value, options ){
+    array = ( array instanceof Array ) ? array : [array];
+    return (array.indexOf(value) > -1) ? options.fn( this ) : "";
+  });
 }(Mirador));
diff --git a/package.json b/package.json
index 0b1ea4baf9..3e4a566cb9 100644
--- a/package.json
+++ b/package.json
@@ -74,6 +74,7 @@
     "mousetrap": "^1.4.6",
     "openseadragon": "^2.2.1",
     "paper": "^0.10.2",
+    "select2": "^4.0.3",
     "spectrum-colorpicker": "^1.8.0",
     "tinymce": "^4.1.7",
     "urijs": "^1.16.1"
diff --git a/spec/annotations/tinymce-annotation-editor.test.js b/spec/annotations/tinymce-annotation-editor.test.js
index fe178c2870..e8c8d7105f 100644
--- a/spec/annotations/tinymce-annotation-editor.test.js
+++ b/spec/annotations/tinymce-annotation-editor.test.js
@@ -49,7 +49,10 @@ describe('TinyMCEAnnotationBodyEditor', function() {
     this.windowId = '380c9e54-7561-4010-a99f-f132f5dc13fd';
     this.tinyMce = new Mirador.TinyMCEAnnotationBodyEditor({
       annotation: this.annotation,
-      windowId: this.windowId
+      windowId: this.windowId,
+      config: {
+        tags: ["config1", "config2"]
+      }
     });
     subject = this.tinyMce;
     subject.show('#mycontainer');
@@ -59,12 +62,12 @@ describe('TinyMCEAnnotationBodyEditor', function() {
     delete this.tinyMce;
     $('body').html('');
   });
-  
+
   describe('Initialization', function() {
     it('should initialize', function() {
       expect(true).toBe(true); //Force beforeEach() setup to run
       expect(this.sandbox.find('.text-editor').val()).toEqual('<p>Waahoo</p>');
-      expect(this.sandbox.find('.tags-editor').val()).toEqual('tagged silly');
+      expect(this.sandbox.find('.tags-editor').val()).toEqual(['tagged', 'silly']);
     });
     it('should initialize with legacy annotations', function() {
       this.annotation.resource = {
@@ -80,7 +83,7 @@ describe('TinyMCEAnnotationBodyEditor', function() {
       expect(this.sandbox.find('.text-editor').val()).toEqual('Old stuff');
     });
   });
-  
+
   describe('isDirty', function() {
     var dirty;
     beforeEach(function() {
@@ -109,9 +112,36 @@ describe('TinyMCEAnnotationBodyEditor', function() {
         })
       };
     });
-    it('should create a full annotation', function() {
+    it('should create a full annotation with tags from config', function() {
+      this.sandbox.find('.text-editor').val('Sample annotation');
+      this.sandbox.find('.tags-editor').val(['config1', 'config2']).trigger('change');
+      expect(subject.createAnnotation()).toEqual({
+        "@context": "http://iiif.io/api/presentation/2/context.json",
+        "@type": "oa:Annotation",
+        "motivation": ['oa:tagging', 'oa:commenting'],
+        "resource": [
+          {
+            "@type": "oa:Tag",
+            "chars": "config1"
+          },
+          {
+            "@type": "oa:Tag",
+            "chars": "config2"
+          },
+          {
+            "@type": "dctypes:Text",
+            "format": "text/html",
+            "chars": "Sample annotation"
+          }
+        ]
+      });
+    });
+
+    it('should create a full annotation with new tags', function() {
       this.sandbox.find('.text-editor').val('Sample annotation');
-      this.sandbox.find('.tags-editor').val('tag nags');
+      this.sandbox.find('.tags-editor').append('<option value="tag">tag</option>');
+      this.sandbox.find('.tags-editor').append('<option value="nags">nags</option>');
+      this.sandbox.find('.tags-editor').val(['tag', 'nags']).trigger('change');
       expect(subject.createAnnotation()).toEqual({
         "@context": "http://iiif.io/api/presentation/2/context.json",
         "@type": "oa:Annotation",
@@ -144,7 +174,7 @@ describe('TinyMCEAnnotationBodyEditor', function() {
         })
       };
     });
-    it('should update the given annotation', function() {
+    it('should update the given annotation with new tags', function() {
       var oaAnno = {
         "@context": "http://iiif.io/api/presentation/2/context.json",
         "@type": "oa:Annotation",
@@ -156,7 +186,9 @@ describe('TinyMCEAnnotationBodyEditor', function() {
         }]
       };
       this.sandbox.find('.text-editor').val('Sample annotation 2');
-      this.sandbox.find('.tags-editor').val('tag2 nags2');
+      this.sandbox.find('.tags-editor').append('<option value="tag2">tag2</option>');
+      this.sandbox.find('.tags-editor').append('<option value="nags2">nags2</option>');
+      this.sandbox.find('.tags-editor').val(['tag2', 'nags2']).trigger('change');
       subject.updateAnnotation(oaAnno);
       expect(oaAnno).toEqual({
         "@context": "http://iiif.io/api/presentation/2/context.json",
@@ -179,5 +211,42 @@ describe('TinyMCEAnnotationBodyEditor', function() {
         ]
       });
     });
+
+    it('should update the given annotation with tags from config', function() {
+      var oaAnno = {
+        "@context": "http://iiif.io/api/presentation/2/context.json",
+        "@type": "oa:Annotation",
+        "motivation": ['oa:commenting'],
+        "resource": [{
+          "@type": "dctypes:Text",
+          "format": "text/html",
+          "chars": "Sample annotation"
+        }]
+      };
+      this.sandbox.find('.text-editor').val('Sample annotation 2');
+      this.sandbox.find('.tags-editor').val(['config1', 'config2']).trigger('change');
+      subject.updateAnnotation(oaAnno);
+      expect(oaAnno).toEqual({
+        "@context": "http://iiif.io/api/presentation/2/context.json",
+        "@type": "oa:Annotation",
+        "motivation": ['oa:commenting', 'oa:tagging'],
+        "resource": [
+          {
+            "@type": "dctypes:Text",
+            "format": "text/html",
+            "chars": "Sample annotation 2"
+          },
+          {
+            "@type": "oa:Tag",
+            "chars": "config1"
+          },
+          {
+            "@type": "oa:Tag",
+            "chars": "config2"
+          }
+        ]
+      });
+    });
+
   });
-}); 
+});

From 0f045e689bcf70840d058ef0cd75dd738fb42769 Mon Sep 17 00:00:00 2001
From: Scott Bailey <csb5t@virginia.edu>
Date: Tue, 30 May 2017 10:32:57 -0700
Subject: [PATCH 06/30] Add a default value for annotation tags

---
 js/src/settings.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/src/settings.js b/js/src/settings.js
index 7e7e15e216..134c72458c 100644
--- a/js/src/settings.js
+++ b/js/src/settings.js
@@ -194,11 +194,12 @@
       'options': {
         config: {
           plugins: "image link media directionality",
-          toolbar: "bold italic | bullist numlist | link image media | removeformat | ltr rtl"
+          toolbar: "bold italic | bullist numlist | link image media | removeformat | ltr rtl",
+          tags: []
         }
       }
     },
-
+    
     'jsonStorageEndpoint': {
       'name': 'JSONBlob API Endpoint',
       'module': 'JSONBlobAPI',

From ec8bde2f08fcc7e93849bc9906f857081dfe5ab6 Mon Sep 17 00:00:00 2001
From: Fabio Torchetti <mrwho@wedjaa.net>
Date: Sun, 11 Jun 2017 15:48:07 -0400
Subject: [PATCH 07/30] Cleanup config before saving to local storage

---
 js/src/utils/saveController.js | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/js/src/utils/saveController.js b/js/src/utils/saveController.js
index 757dbe3d4c..66a9e9defa 100755
--- a/js/src/utils/saveController.js
+++ b/js/src/utils/saveController.js
@@ -72,6 +72,7 @@
     this.init(newConfig);
   };
 
+
   $.SaveController.prototype = {
 
     init: function(config) {
@@ -372,6 +373,37 @@
 
     },
 
+  cleanup: function(obj) {
+
+    /**
+     * Setup a Set to track the objects we have
+     * already cloned - this clean circular refs.
+     **/
+    var clonedSet = new Set();
+
+    function cloner(obj) {
+
+      if(obj === null || typeof(obj) != 'object') {
+        return obj;
+      }
+
+      if (!clonedSet.has(obj)) {
+        clonedSet.add(obj);
+        var temp = Array.isArray(obj) ? [] : {};
+        for(var key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            temp[key] = cloner(obj[key]);
+          }
+        }
+        return temp;
+      }
+
+      return undefined;
+    }
+
+    return cloner(obj);
+  }
+
     save: function() {
       var _this = this;
 
@@ -379,7 +411,7 @@
       // localStorage is a key:value store that
       // only accepts strings.
 
-      localStorage.setItem(_this.sessionID, JSON.stringify(_this.currentConfig));
+      localStorage.setItem(_this.sessionID, JSON.stringify(_this.cleanup(_this.currentConfig)));
     }
 
   };

From 600fbc9d598ee53f9637b5a8ca6d57650456c821 Mon Sep 17 00:00:00 2001
From: Fabio Torchetti <mrwho@wedjaa.net>
Date: Sun, 11 Jun 2017 15:58:44 -0400
Subject: [PATCH 08/30] Remove recursion when saving from bookmarkPanel

---
 js/src/utils/saveController.js | 44 +++++++++++++++++-----------------
 js/src/viewer/bookmarkPanel.js |  2 +-
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/js/src/utils/saveController.js b/js/src/utils/saveController.js
index 66a9e9defa..368ce99041 100755
--- a/js/src/utils/saveController.js
+++ b/js/src/utils/saveController.js
@@ -373,36 +373,36 @@
 
     },
 
-  cleanup: function(obj) {
+    cleanup: function(obj) {
 
-    /**
-     * Setup a Set to track the objects we have
-     * already cloned - this clean circular refs.
-     **/
-    var clonedSet = new Set();
+      /**
+       * Setup a Set to track the objects we have
+       * already cloned - this clean circular refs.
+       **/
+      var clonedSet = new Set();
 
-    function cloner(obj) {
+      function cloner(obj) {
 
-      if(obj === null || typeof(obj) != 'object') {
-        return obj;
-      }
+        if(obj === null || typeof(obj) != 'object') {
+          return obj;
+        }
 
-      if (!clonedSet.has(obj)) {
-        clonedSet.add(obj);
-        var temp = Array.isArray(obj) ? [] : {};
-        for(var key in obj) {
-          if (obj.hasOwnProperty(key)) {
-            temp[key] = cloner(obj[key]);
+        if (!clonedSet.has(obj)) {
+          clonedSet.add(obj);
+          var temp = Array.isArray(obj) ? [] : {};
+          for(var key in obj) {
+            if (obj.hasOwnProperty(key)) {
+              temp[key] = cloner(obj[key]);
+            }
           }
+          return temp;
         }
-        return temp;
-      }
 
-      return undefined;
-    }
+        return undefined;
+      }
 
-    return cloner(obj);
-  }
+      return cloner(obj);
+    },
 
     save: function() {
       var _this = this;
diff --git a/js/src/viewer/bookmarkPanel.js b/js/src/viewer/bookmarkPanel.js
index a14275d4b1..62a19b43d1 100644
--- a/js/src/viewer/bookmarkPanel.js
+++ b/js/src/viewer/bookmarkPanel.js
@@ -47,7 +47,7 @@
 
     onConfigUpdated: function() {
       var _this = this;
-      _this.storageModule.save(_this.state.currentConfig)
+      _this.storageModule.save(_this.state.cleanup(_this.state.currentConfig))
       .then(function(blobId) {
         var bookmarkURL = window.location.href.replace(window.location.hash, '') + "?json="+blobId;
         _this.element.find('#share-url').val(bookmarkURL).focus().select();

From b75c1aa5c96bbbd64f49f62d88ed2ff1b570e65a Mon Sep 17 00:00:00 2001
From: Fabio Torchetti <mrwho@wedjaa.net>
Date: Sun, 11 Jun 2017 16:43:30 -0400
Subject: [PATCH 09/30] Added tests for cleanup function

---
 spec/utils/saveController.test.js | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/spec/utils/saveController.test.js b/spec/utils/saveController.test.js
index ab4acaeaf5..1ef0a79509 100644
--- a/spec/utils/saveController.test.js
+++ b/spec/utils/saveController.test.js
@@ -123,6 +123,32 @@ describe('SaveController', function () {
     });
   });
   
+  describe('Test Cleaning Up Objects', function () {
+    it('should remove circular references', function () {
+
+      var saveController = new Mirador.SaveController(this.config);
+      
+      var object_a = { valid: 'This is a valid value' };
+      var object_b = { valid: 'This is a valid value', invalid: object_a };
+      object_a.object_b = object_b;
+
+      var cleaned = saveController.cleanup(object_a);
+
+      /**
+        * The original object should be untouched. 
+        */
+      expect(object_a.object_b.invalid).not.toBeUndefined();
+
+      /**
+        * object_a reference in cleaned should be the only 
+        * value missing.
+        */
+      expect(cleaned.valid).toBe('This is a valid value');
+      expect(cleaned.object_b.invalid).toBeUndefined();
+      expect(cleaned.object_b.valid).toBe('This is a valid value');
+    });
+  });
+
   describe('Event handling', function () {
     xit('should handle windowUpdated', function () {
     });

From 722a84f45a3b549ded1bd5eae89e4fd3fb633581 Mon Sep 17 00:00:00 2001
From: aeschylus <scipioaffricanus@gmail.com>
Date: Mon, 19 Jun 2017 11:45:25 -0700
Subject: [PATCH 10/30] replace use of set with array

---
 js/src/utils/saveController.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/js/src/utils/saveController.js b/js/src/utils/saveController.js
index 368ce99041..395df1161f 100755
--- a/js/src/utils/saveController.js
+++ b/js/src/utils/saveController.js
@@ -376,10 +376,11 @@
     cleanup: function(obj) {
 
       /**
-       * Setup a Set to track the objects we have
-       * already cloned - this clean circular refs.
+       * Setup an array-based implementation of a Set
+       * to track the objects we have
+       * already cloned - this will generically clean circular refs.
        **/
-      var clonedSet = new Set();
+      var clonedSet = [];
 
       function cloner(obj) {
 
@@ -387,8 +388,8 @@
           return obj;
         }
 
-        if (!clonedSet.has(obj)) {
-          clonedSet.add(obj);
+        if (clonedSet.indexOf(obj) === -1) {
+          clonedSet.push(obj);
           var temp = Array.isArray(obj) ? [] : {};
           for(var key in obj) {
             if (obj.hasOwnProperty(key)) {

From 075c03c3d751fdc57b4b56021e867933f1a04a9e Mon Sep 17 00:00:00 2001
From: aeschylus <scipioaffricanus@gmail.com>
Date: Mon, 26 Jun 2017 16:59:59 -0700
Subject: [PATCH 11/30] update merged code to use canvasModel for mirroring
 math, and update test mocks

---
 js/src/annotations/osd-region-draw-tool.js | 5 ++++-
 js/src/annotations/osd-svg-overlay.js      | 2 +-
 spec/annotations/osd-svg-overlay.test.js   | 4 ----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/js/src/annotations/osd-region-draw-tool.js b/js/src/annotations/osd-region-draw-tool.js
index 08ef90c3e8..748385707d 100644
--- a/js/src/annotations/osd-region-draw-tool.js
+++ b/js/src/annotations/osd-region-draw-tool.js
@@ -157,6 +157,9 @@
 
     showTooltipsFromMousePosition: function(event, location, absoluteLocation) {
       var _this = this;
+      var originWindow = this.state.getWindowObjectById(this.windowId);
+      var currentCanvasModel = originWindow.canvases[originWindow.canvasID];
+
       var hitOptions = {
         fill: true,
         stroke: true,
@@ -165,7 +168,7 @@
       var hoverColor = this.state.getStateProperty('drawingToolsSettings').hoverColor;
       var annotations = [];
       if (this.horizontallyFlipped) {
-        location.x = this.svgOverlay.viewer.tileSources.width - location.x;
+        location.x = currentCanvasModel.getBounds().width;
       }
       for (var key in _this.annotationsToShapesMap) {
         if (_this.annotationsToShapesMap.hasOwnProperty(key)) {
diff --git a/js/src/annotations/osd-svg-overlay.js b/js/src/annotations/osd-svg-overlay.js
index 8e05c6aa17..336d48e460 100644
--- a/js/src/annotations/osd-svg-overlay.js
+++ b/js/src/annotations/osd-svg-overlay.js
@@ -493,7 +493,7 @@
         mousePosition.y = currentCanvasModel.getBounds().height;
       }
       if (this.horizontallyFlipped) {
-        mousePosition.x = this.viewer.tileSources.width - mousePosition.x;
+        mousePosition.x = currentCanvasModel.getBounds().width - mousePosition.x;
       }
       return mousePosition;
     },
diff --git a/spec/annotations/osd-svg-overlay.test.js b/spec/annotations/osd-svg-overlay.test.js
index 1e8c61ebc2..38d60f99bd 100644
--- a/spec/annotations/osd-svg-overlay.test.js
+++ b/spec/annotations/osd-svg-overlay.test.js
@@ -370,10 +370,6 @@ describe('Overlay', function() {
     this.rectangle = new Mirador.Rectangle(); // TODO should use stubbed tool
     spyOn(this.rectangle, 'onMouseDown');
     spyOn(this.rectangle, 'onDoubleClick');
-    this.overlay.viewer.tileSources = {
-      'width': 998,
-      'height': 998
-    }
     var event = getEvent({
       'x': 100,
       'y': 100

From 37ed7f5d1b0788dfe46019d190dc716837f9be92 Mon Sep 17 00:00:00 2001
From: aeschylus <scipioaffricanus@gmail.com>
Date: Tue, 27 Jun 2017 10:31:52 -0700
Subject: [PATCH 12/30] add back reflection offset for tooltip positioning

---
 js/src/annotations/osd-region-draw-tool.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/annotations/osd-region-draw-tool.js b/js/src/annotations/osd-region-draw-tool.js
index 748385707d..a86f1033f6 100644
--- a/js/src/annotations/osd-region-draw-tool.js
+++ b/js/src/annotations/osd-region-draw-tool.js
@@ -168,7 +168,7 @@
       var hoverColor = this.state.getStateProperty('drawingToolsSettings').hoverColor;
       var annotations = [];
       if (this.horizontallyFlipped) {
-        location.x = currentCanvasModel.getBounds().width;
+        location.x = currentCanvasModel.getBounds().width - location.x;
       }
       for (var key in _this.annotationsToShapesMap) {
         if (_this.annotationsToShapesMap.hasOwnProperty(key)) {

From 96fa9a85dee6ced1f97824da611dba1285f9d8a8 Mon Sep 17 00:00:00 2001
From: aeschylus <scipioaffricanus@gmail.com>
Date: Tue, 27 Jun 2017 15:06:03 -0700
Subject: [PATCH 13/30] increment version number for 2.5.1 release

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3e4a566cb9..7f13077137 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mirador",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Multi-window image viewer, a web-based tool to support researcher goals",
   "repository": {
     "type": "git",

From 79685650966c384c12b38b220f68d72881715dcb Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Mon, 10 Jul 2017 09:59:07 +0200
Subject: [PATCH 14/30] Fix testcase

---
 spec/utils/jsonLd.test.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/spec/utils/jsonLd.test.js b/spec/utils/jsonLd.test.js
index 785c5d925c..a030e91313 100644
--- a/spec/utils/jsonLd.test.js
+++ b/spec/utils/jsonLd.test.js
@@ -5,13 +5,13 @@ describe('JsonLd', function () {
       expect(Mirador.JsonLd.getTextValue(null, 'txg')).toEqual('');
       expect(Mirador.JsonLd.getTextValue(null)).toEqual('');
     });
-    
+
     it('should return the same string when given a string', function() {
       expect(Mirador.JsonLd.getTextValue('waahoo', 'en')).toEqual('waahoo');
       expect(Mirador.JsonLd.getTextValue('waahoo', 'xto')).toEqual('waahoo');
       expect(Mirador.JsonLd.getTextValue('waahoo')).toEqual('waahoo');
     });
-    
+
     it('should return the localized name when given an array of translations', function() {
       // Short sample
       var sample = [
@@ -32,7 +32,7 @@ describe('JsonLd', function () {
       //Should default to en
       expect(Mirador.JsonLd.getTextValue(sample)).toEqual("Alternate Title");
     });
-    
+
     it('should return "@value" key when given an object', function() {
       var sample = {
         "@value": "Super waahoo",
@@ -58,7 +58,7 @@ describe('JsonLd', function () {
         'This is another value without a language.',
         {'@value': "C'est une valeur française.",
          '@language': "fr"}];
-      window.navigator.languages = ['en-US', 'en']
+      i18next.languages = ['en-US', 'en']
       expect(Mirador.JsonLd.getTextValue(sample)).toEqual("This is an American value.");
     });
 

From caf3b0a54515ec85d6af3f854ef727d2eeacc0f2 Mon Sep 17 00:00:00 2001
From: regisrob <regisrobineau@gmail.com>
Date: Tue, 18 Jul 2017 10:59:02 +0200
Subject: [PATCH 15/30] Small css improvements into metadata panel

---
 css/less/panels/metadata-view.less | 9 ++++++---
 css/less/window.less               | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/css/less/panels/metadata-view.less b/css/less/panels/metadata-view.less
index 3b8ce22c8e..c9a71fe69e 100644
--- a/css/less/panels/metadata-view.less
+++ b/css/less/panels/metadata-view.less
@@ -1,10 +1,12 @@
 .mirador-container {
   .mirador-viewer .sub-title {
     border-bottom: 2px solid @gray-cc;
-    color: @gray-66;
+    color: @black;
     font-weight: bold;
     margin: 10px 20px 5px 20px;
     padding: 0 5px 5px 0;
+    font-size: 120%;
+    text-transform: uppercase;
   }
 
   .mirador-viewer .metadata-listing {
@@ -15,7 +17,7 @@
   }
 
   .mirador-viewer .metadata-item {
-    padding: 5px 0;
+    padding: 10px 0 5px 0;
   }
 
   .mirador-viewer .metadata-label, .mirador-viewer .metadata-value {
@@ -23,8 +25,9 @@
   }
 
   .mirador-viewer .metadata-label {
-    color: @gray-55;
+    color: @gray-66;
     font-style: italic;
+    text-transform: uppercase;
   }
 
   .mirador-viewer .metadata-value {
diff --git a/css/less/window.less b/css/less/window.less
index 8b8a91a5b2..0c127491de 100644
--- a/css/less/window.less
+++ b/css/less/window.less
@@ -56,6 +56,7 @@
     overflow-y: scroll;
     height: 80%;
     word-wrap: break-word;
+    font-size: 90%;
   }
 
   .thumbnail-view, .image-view, .book-view, .scroll-view {

From 83a9edaaefec99cce6eea91a8178e9395205629b Mon Sep 17 00:00:00 2001
From: regisrob <regisrobineau@gmail.com>
Date: Tue, 18 Jul 2017 18:42:15 +0200
Subject: [PATCH 16/30] Enhance styles in the side panel

---
 css/less/global.less                      | 23 ++++++
 css/less/main.less                        |  1 +
 css/less/panels/layers-tab.less           |  3 +-
 css/less/panels/manifest-select-menu.less |  9 ---
 css/less/panels/metadata-view.less        |  4 +-
 css/less/panels/side-panel.less           | 87 ++++++++++-------------
 js/src/widgets/searchWithinResults.js     | 10 ++-
 7 files changed, 70 insertions(+), 67 deletions(-)

diff --git a/css/less/global.less b/css/less/global.less
index 504ba63aba..399818cd09 100644
--- a/css/less/global.less
+++ b/css/less/global.less
@@ -157,4 +157,27 @@
     /*color: @gray-91;*/
     box-sizing: border-box;
   }
+
+  input[type="submit"],
+  input[type="text"] {
+    height:25px;
+    border:1px solid @light-gray;
+    transition: border-color 0.3s ease-out;
+  }
+
+  input:focus {
+    outline: none;
+    border-color: @deep-sky-blue;
+  }
+
+  input[type="submit"] {
+    color: gray;
+    background: @white;
+  }
+
+  input[type="submit"]:hover {
+    outline: none;
+    border-color: @deep-sky-blue;
+    color: @black-33;
+  }
 }
diff --git a/css/less/main.less b/css/less/main.less
index 7d1611e717..8b17ca5a64 100644
--- a/css/less/main.less
+++ b/css/less/main.less
@@ -24,3 +24,4 @@
 @import 'panels/metadata-view';
 @import 'panels/bottom-panel';
 @import 'panels/layers-tab';
+@import 'panels/search-tab';
diff --git a/css/less/panels/layers-tab.less b/css/less/panels/layers-tab.less
index 1d469b479a..0ea9dbb3dc 100644
--- a/css/less/panels/layers-tab.less
+++ b/css/less/panels/layers-tab.less
@@ -19,8 +19,7 @@
   }
   .layers-list-item {
     .clearfix();
-    border-top: 1px solid gray;
-    border-bottom: 1px solid gray;
+    border-top: 1px solid @gray-b1;
     padding: 10px 10px 10px 0;
     margin-right: 20px;
     &>h4 {
diff --git a/css/less/panels/manifest-select-menu.less b/css/less/panels/manifest-select-menu.less
index cf7e0833dc..6c5710a1f3 100644
--- a/css/less/panels/manifest-select-menu.less
+++ b/css/less/panels/manifest-select-menu.less
@@ -247,15 +247,6 @@
       display: table;
       clear: both;
     }
-
-    input {
-      height:25px;
-      border:1px solid @light-gray;
-      color: gray;
-      background:none;
-      border-radius: 2px;
-      transition: border-color 0.3s ease-out;
-    }
   }
 
   #manifest-search-form {
diff --git a/css/less/panels/metadata-view.less b/css/less/panels/metadata-view.less
index c9a71fe69e..7da12b1a9b 100644
--- a/css/less/panels/metadata-view.less
+++ b/css/less/panels/metadata-view.less
@@ -1,7 +1,7 @@
 .mirador-container {
   .mirador-viewer .sub-title {
-    border-bottom: 2px solid @gray-cc;
-    color: @black;
+    border-bottom: 1px solid @gray-b1;
+    color: @black-33;
     font-weight: bold;
     margin: 10px 20px 5px 20px;
     padding: 0 5px 5px 0;
diff --git a/css/less/panels/side-panel.less b/css/less/panels/side-panel.less
index c1d3d071d3..7d278ef633 100644
--- a/css/less/panels/side-panel.less
+++ b/css/less/panels/side-panel.less
@@ -22,25 +22,30 @@
     }
 
     .tab {
-      padding: 4px 6px;
-      border-left:0;
-      border-bottom: 2px solid @black;
+      padding: 8px;
+      margin-right: 2px;
       display: inline-block;
       cursor: pointer;
-      border-radius: 3px 3px 0 0;
+      background: @gray-dd;
+      border-width: 1px 1px 0 1px;
+      border-color: @gray-b1;
+      border-style: solid;
+      color: @gray-66;
+      font-size: .9em;
     }
-
+  
     .tab:not(.selected):hover {
-      border: 2px solid @black-a30;
-      border-bottom: 2px solid @black;
-      padding:4px 4px;
+      background: @light-gray;
+      color: @black-33;
     }
 
     .tab.selected {
-      border: 2px solid @black;
-      border-bottom:0;
-      border-radius: 3px 3px 0 0;
-      margin: 0 -2px;
+      font-weight: bold;
+      color: @black-33;
+      background: @gray-ef;
+      border-top-width: 1px;
+      border-top-style: solid;
+      border-top-color: deepskyblue;
     }
 
     .annotationListItem {
@@ -78,6 +83,18 @@
       text-decoration: none;
     }
 
+    h2 {
+      font-size: 1em;
+    }
+
+    h3 {
+      font-size: .9em;
+    }
+
+    h4 {
+      font-size: .8em;
+    }
+
     h1, h2, h3, h4 {
       margin:0;
       padding:0;
@@ -86,21 +103,6 @@
 
     h1:hover, h2:hover, h3:hover, h4:hover {
     }
-
-    /*
-    h2 {
-      font-size: 1.5em;
-    }
-    h3 {
-      font-size: 1.25em;
-    }
-    h4 {
-      font-size: 1.0em;
-    }
-    h5 {
-      font-size: .75em;
-    }
-    */
   }
 
   .sidePanel.minimized {
@@ -120,6 +122,7 @@
     box-sizing: border-box;
     overflow: hidden;
     transition: all 0.3s ease;
+    margin-top: 8px;
   }
 
   .annotationsPanel ul {
@@ -127,23 +130,6 @@
     margin:0;
   }
 
-  .search-results {
-    padding:0 5px 0 0;
-    margin:0;
-    position:absolute;
-    height: 100%;
-
-    .search-results-container {
-      overflow-y: scroll;
-      position: absolute;
-      height: 70%;
-    }
-
-    .search-results-list .result-wrapper .result-paragraph .highlight {
-      background-color: rgb(255, 255, 0);
-    }
-  }
-
   .toc {
     margin:0;
     overflow-y: scroll;
@@ -155,7 +141,7 @@
     top:0px;
     bottom:0;
     list-style-type:none;
-    font-size: 75%;
+    margin-bottom: 30px; /* fix overflow-y bug when .tabGroup is present */
 
     a.toc-link {
       color: black;
@@ -186,6 +172,7 @@
       position:relative;
       margin-left:8px;
       margin-bottom: 5px;
+      border-left: 4px solid @gray-ef;
 
       &.open {
       }
@@ -197,6 +184,10 @@
         transition: all 0.2s ease-out;
       }
     }
+
+    > li {
+      margin-left: 0;
+    }
   }
 
   .toc-link i {
@@ -273,9 +264,9 @@
     color:black;
   }
 
-  .toc li:hover>h2 a.toc-link, .toc li:hover>h3 a.toc-link, .toc li:hover>h4 a.toc-link, .toc li:hover>h5 a.toc-link, .toc li:hover>h6 a.toc-link {
-    font-weight: bold;
-  }
+  // .toc li:hover>h2 a.toc-link, .toc li:hover>h3 a.toc-link, .toc li:hover>h4 a.toc-link, .toc li:hover>h5 a.toc-link, .toc li:hover>h6 a.toc-link {
+  //   font-weight: bold;
+  // }
 
   /*
   .toc li:hover > h2 a {
diff --git a/js/src/widgets/searchWithinResults.js b/js/src/widgets/searchWithinResults.js
index 6768db46d6..7b5be56a3d 100644
--- a/js/src/widgets/searchWithinResults.js
+++ b/js/src/widgets/searchWithinResults.js
@@ -37,7 +37,7 @@ $.SearchWithinResults.prototype = {
 
     jQuery(this.appendTo).empty();
     this.element = jQuery(this.template()).appendTo(this.appendTo);
-    jQuery("<hr/><h3>Search results for: " + this.query_params.q + "</h3><hr/>")
+    jQuery("<h3>Search results for: " + this.query_params.q + "</h3>")
         .appendTo(this.appendTo.find('.search-results-messages'));
     this.doSearchFromQuery(this.query_params);
   },
@@ -83,11 +83,11 @@ $.SearchWithinResults.prototype = {
           // show results list
           _this.processResults(searchResults);
       } else {
-        jQuery('.search-results-count').html("<hr/><p>No results</p><hr/>");
+        jQuery('.search-results-count').html("<p>No results</p>");
       }
     })
     .fail(function() {
-        jQuery('.search-results-count').html("<hr/><p>No results</p><hr/>");
+        jQuery('.search-results-count').html("<p>No results</p>");
     })
     .always();
   },
@@ -112,7 +112,7 @@ $.SearchWithinResults.prototype = {
       endResultNumber = searchResults.startIndex + 1;
     }
 
-    jQuery('.search-results-count').html("<hr/><p>Showing " + startResultNumber + " - " + endResultNumber + " out of " + total + "</p><hr/>");
+    jQuery('.search-results-count').html("<p>Showing " + startResultNumber + " - " + endResultNumber + " out of " + total + "</p>");
   },
 
   processResults: function(searchResults) {
@@ -437,14 +437,12 @@ $.SearchWithinResults.prototype = {
             '{{canvaslabel}}',
           '</a>',
           '{{#if annotations}}',
-            '<div>',
             '<em>Annotations</em>: ',
             '{{#each annotations}}',
               '<a class="search-result search-annotation js-show-canvas" data-canvasid="{{canvasid}}" data-coordinates="{{coordinates}}">',
                 '<i class="fa fa-fw" aria-hidden="true"></i>',
               '</a>',
             '{{/each}}',
-            '</div>',
           '{{/if}}',
           '<div class="search-result result-paragraph js-show-canvas" data-canvasid="{{canvasid}}" data-coordinates="{{coordinates}}">',
             '{{#if hit.before}}',

From d18ef391c654afc440aa631c0e2bd7af6c12288c Mon Sep 17 00:00:00 2001
From: regisrob <regisrobineau@gmail.com>
Date: Tue, 18 Jul 2017 18:47:47 +0200
Subject: [PATCH 17/30] Add new translatable strings in the side panel Update
 english and french locales

---
 js/src/widgets/searchTab.js |  7 +++----
 js/src/widgets/sidePanel.js |  6 +++---
 locales/en/translation.json |  6 ++++++
 locales/fr/translation.json | 18 +++++++++++++++---
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/js/src/widgets/searchTab.js b/js/src/widgets/searchTab.js
index 24723e68d0..4c178e9dee 100644
--- a/js/src/widgets/searchTab.js
+++ b/js/src/widgets/searchTab.js
@@ -159,15 +159,14 @@
     template: $.Handlebars.compile([
       '<div class="search-results">',
         '{{#if searchService}}',
-          '<label>Select Search Service',
+        '<label for="search-within-selector">{{t "searchLabelSelect"}}</label>',
           '<select id="search-within-selector" style="width: 100%">',
             '{{#each searchService}}',
             '<option value="{{ url }}">{{#if label}}{{ label }}{{ else }} {{ url }}{{/if}}</option>',
             '{{/each}}',
           '</select>',
-          '</label>',
           '<form id="search-within-form" class="js-perform-query">',
-            '<input class="js-query" type="text" placeholder="search text"/>',
+            '<input class="js-query" type="text" placeholder="{{t "searchText"}}"/>',
 
             '<input style="margin: 10px 0" type="submit"/>',
 
@@ -181,7 +180,7 @@
           '</form>',
           '<div class="search-results-list"></div>',
         '{{else}}',
-          'No search service available',
+          '{{t "searchNotAvailable"}}',
         '{{/if}}',
       '</div>',
     ].join(''))
diff --git a/js/src/widgets/sidePanel.js b/js/src/widgets/sidePanel.js
index 10abe9046b..6fd92ed7a1 100644
--- a/js/src/widgets/sidePanel.js
+++ b/js/src/widgets/sidePanel.js
@@ -29,7 +29,7 @@
             options : {
               available: _this.tocTabAvailable,
               id:'tocTab',
-              label:'Index'
+              label: i18next.t('tabTitleIndex')
             }
           },
           /*{
@@ -45,7 +45,7 @@
             options : {
               available: _this.searchTabAvailable,
               id: 'searchTab',
-              label: 'Search'
+              label: i18next.t('tabTitleSearch')
             }
           },
           {
@@ -53,7 +53,7 @@
             options : {
               available: _this.layersTabAvailable,
               id:'layersTab',
-              label:'Layers'
+              label: i18next.t('tabTitleLayers')
             }
           },
         ],
diff --git a/locales/en/translation.json b/locales/en/translation.json
index 3eb4b1c76d..9eba6af16d 100644
--- a/locales/en/translation.json
+++ b/locales/en/translation.json
@@ -78,10 +78,16 @@
   "saturationTooltip": "Adjust saturation",
   "save": "Save",
   "scrollView": "Scroll View",
+  "searchLabelSelect": "Select Search Service",
+  "searchNotAvailable": "No search service available",
+  "searchText": "Search text",
   "seeAlso": "See Also",
   "selectGrid": "Select a grid below",
   "sidePanelTooltip": "Toggle the side panel",
   "solid": "Solid",
+  "tabTitleIndex": "Index",
+  "tabTitleLayers": "Layers",
+  "tabTitleSearch": "Search",
   "thick": "Thick",
   "thickest": "Thickest",
   "thumbnailsView": "Gallery View",
diff --git a/locales/fr/translation.json b/locales/fr/translation.json
index 05f9029ba5..5619c8db40 100644
--- a/locales/fr/translation.json
+++ b/locales/fr/translation.json
@@ -11,7 +11,7 @@
     "bookmark": "Sauvegarder / Partager",
     "bookmarkTitle": "Sauvegarder ou partager cet espace de travail Mirador",
     "bookmarkTooltip": "Obtenir le lien vers cet espace de travail Mirador",
-    "bookView": "Double page",
+    "bookView": "Vue livre",
     "borderColorTooltip": "Choisir la couleur de bordure",
     "borderTypeTooltip": "Choisir le style de bordure",
     "brightnessTooltip": "Luminosité",
@@ -29,6 +29,8 @@
     "deleteShape":"Voulez-vous supprimer cette forme",
     "description": "Description",
     "details": "Détails",
+    "disabledLayersTabMessage": "Les calques d'image ne sont accessibles que depuis la vue image",
+    "disabledOpacityMessage": "désactivé",
     "dotDashed":"Pointillés et traits",
     "dropToLoad": "Déposer ici pour ajouter l'objet",
     "edit": "Editer",
@@ -36,6 +38,7 @@
     "editModalBtnSaveWithoutShapes":"Enregistrer l'annotation sans aucune forme associée ?",
     "editModalSaveAnnotationWithNoShapesMsg":"Aucune forme n'est associée à cette annotation.",
     "ellipseTooltip": "Ovale",
+    "emptyTemplateMessage": "Il n'y a pas de calques d'image sur ce canevas",
     "fillColorTooltip": "Choisir une couleur de remplissage",
     "filterObjects": "Filtrer la liste",
     "freehandTooltip": "Tracé libre",
@@ -44,7 +47,8 @@
     "fullScreenWindowTooltip": "Ouvrir cette fenêtre en plein écran",
     "grayscaleTooltip": "Niveaux de gris",
     "imageManipulationTooltip": "Modifier les réglages de l'image",
-    "imageView": "Simple page",
+    "imagesFor": "Images pour",
+    "imageView": "Vue image",
     "invertTooltip": "Couleurs inversées",
     "item": "objet",
     "items": "objets",
@@ -58,8 +62,9 @@
     "more": "restants",
     "newObject": "Nouvel objet",
     "no": "Non",
-    "noIndex": "Pas de sommaire disponible",
+    "noIndex": "Aucun index disponible",
     "objectMetadata": "Métadonnées",
+    "opacityLabel": "opacité",
     "pinTooltip": "Marqueur",
     "pointerTooltip": "Pointeur",
     "polygonTooltip": "Polygone",
@@ -73,16 +78,23 @@
     "saturationTooltip": "Saturation",
     "save": "Enregistrer",
     "scrollView": "Défilement horizontal",
+    "searchLabelSelect": "Choisir le service",
+    "searchNotAvailable": "Aucun service de recherche disponible",
+    "searchText": "Rechercher",
     "seeAlso": "Voir aussi",
     "selectGrid": "Sélectionner la grille de votre choix",
     "sidePanelTooltip": "Ouvrir le panneau latéral",
     "solid":"Ligne continue",
+    "tabTitleIndex": "Index",
+    "tabTitleLayers": "Calques",
+    "tabTitleSearch": "Rechercher",
     "thick": "Epais",
     "thickest": "Plus épais",
     "thumbnailsView": "Mosaïque",
     "unspecified": "Non spécifié",
     "url": "URL",
     "viewTypeTooltip": "Changer le type de vue",
+    "visibleLabel": "visible",
     "within": "Fait partie de",
     "yes": "Oui"
 }

From 2fc9efe10a66b97d1319b41ee5a6350662712f8e Mon Sep 17 00:00:00 2001
From: regisrob <regisrobineau@gmail.com>
Date: Wed, 19 Jul 2017 09:00:26 +0200
Subject: [PATCH 18/30] Add new less file for search tab

---
 css/less/panels/search-tab.less | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 css/less/panels/search-tab.less

diff --git a/css/less/panels/search-tab.less b/css/less/panels/search-tab.less
new file mode 100644
index 0000000000..5fc6f36c17
--- /dev/null
+++ b/css/less/panels/search-tab.less
@@ -0,0 +1,44 @@
+.mirador-container {
+
+	.search-results {
+		padding:0 5px 0 0;
+    margin:0;
+    position:absolute;
+    height: 100%;
+
+    select {
+      margin: 5px 0 10px 0;
+    }
+	}
+
+	.search-results-list {
+		position: relative;
+		height: 100%;
+
+		.search-results-messages {
+			border-top: 1px solid @gray-b1;
+    	padding-top: 10px;
+    	margin-top: 10px;
+		}
+
+		.search-results-count {
+			font-size: .85em;
+		}
+
+    .search-results-container {
+      overflow-y: scroll;
+      position: absolute;
+      height: 70%;
+    }
+
+    .result-wrapper {
+			margin-bottom: 5px;
+
+			.result-paragraph {
+				.highlight {
+					background-color: rgb(255, 255, 0);
+				}
+    	}
+    } 
+	}
+}
\ No newline at end of file

From 1345e405874f678a6739bce273215d711da0dc80 Mon Sep 17 00:00:00 2001
From: regisrob <regisrobineau@gmail.com>
Date: Wed, 19 Jul 2017 09:21:31 +0200
Subject: [PATCH 19/30] Add manifest url in metadata view

---
 js/src/widgets/metadataView.js | 4 ++++
 locales/en/translation.json    | 1 +
 locales/fr/translation.json    | 1 +
 3 files changed, 6 insertions(+)

diff --git a/js/src/widgets/metadataView.js b/js/src/widgets/metadataView.js
index 06e2508eee..9c71f9ba6c 100755
--- a/js/src/widgets/metadataView.js
+++ b/js/src/widgets/metadataView.js
@@ -173,6 +173,10 @@
         identifier: 'seeAlso',
         label: i18next.t('seeAlso'),
         value: this.stringifyRelated(jsonLd.seeAlso || '')
+      }, {
+        identifier: 'manifest',
+        label: i18next.t('manifest'),
+        value: this.stringifyRelated(jsonLd['@id'] || '')
       }, {
         identifier: 'within',
         label: i18next.t('within'),
diff --git a/locales/en/translation.json b/locales/en/translation.json
index 3eb4b1c76d..796f93c85a 100644
--- a/locales/en/translation.json
+++ b/locales/en/translation.json
@@ -57,6 +57,7 @@
   "links": "Links",
   "load": "Load",
   "logo": "Logo",
+  "manifest": "IIIF Manifest",
   "metadataTooltip": "View information/metadata about this object",
   "mirrorTooltip": "Mirror image",
   "more": "more",
diff --git a/locales/fr/translation.json b/locales/fr/translation.json
index 05f9029ba5..19edb53450 100644
--- a/locales/fr/translation.json
+++ b/locales/fr/translation.json
@@ -53,6 +53,7 @@
     "links": "Liens",
     "load": "Ajouter",
     "logo": "Logo",
+    "manifest": "Manifest IIIF",
     "metadataTooltip": "Afficher les informations/métadonnées",
     "mirrorTooltip": "Retourner l'image (axe horizontal)",
     "more": "restants",

From 83cca8577f4bd7f3372f2b32b976773c153822da Mon Sep 17 00:00:00 2001
From: Rashmi Singhal <rashmi.s.singhal@gmail.com>
Date: Fri, 28 Jul 2017 13:06:48 -0400
Subject: [PATCH 20/30] fix tests so they pass

---
 spec/widgets/metadataView.test.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spec/widgets/metadataView.test.js b/spec/widgets/metadataView.test.js
index 91c0836317..585c0d4409 100644
--- a/spec/widgets/metadataView.test.js
+++ b/spec/widgets/metadataView.test.js
@@ -9,7 +9,7 @@ describe('MetadataView', function() {
     $('body').append('<div id="metadata-view-container"></div>');
     this.sandbox = jQuery('#metadata-view-container');
     this.windowId = '380c9e54-7561-4010-a99f-f132f5dc13fd';
-    this.canvasID = 'https://oculus-dev.harvardx.harvard.edu/manifests/drs:5981093/canvas/canvas-5981522.json';
+    this.canvasID = 'https://iiif.lib.harvard.edu/manifests/drs:5981093/canvas/canvas-5981522.json';
     this.metadataView = new Mirador.MetadataView({
       manifest: this.manifest,
       appendTo: this.sandbox,
@@ -119,10 +119,12 @@ describe('MetadataView', function() {
       expect(subject.getMetadataLinks({
         related: "http://news.example.net",
         seeAlso: "http://oodlepods.example.net",
+        '@id': "http://www.example.org/iiif/book1/manifest",
         within: "Oodlepods Monthly Issue #6"
       })).toEqual([
         { identifier: 'related', label: 'related', value: '<a href="http://news.example.net" target="_blank">http://news.example.net</a>' },
         { identifier: 'seeAlso', label: 'seeAlso', value: '<a href="http://oodlepods.example.net" target="_blank">http://oodlepods.example.net</a>' },
+        { identifier: 'manifest', label: 'manifest', value: '<a href="http://www.example.org/iiif/book1/manifest" target="_blank">http://www.example.org/iiif/book1/manifest</a>'},
         { identifier: 'within', label: 'within', value: 'Oodlepods Monthly Issue #6' }
       ]);
     });
@@ -130,6 +132,7 @@ describe('MetadataView', function() {
       expect(subject.getMetadataLinks(this.manifest.jsonLd)).toEqual([
         { identifier: 'related', label: 'related', value: '' },
         { identifier: 'seeAlso', label: 'seeAlso', value: '' },
+        { identifier: 'manifest', label: 'manifest', value: '<a href="http://www.example.org/iiif/book1/manifest" target="_blank">http://www.example.org/iiif/book1/manifest</a>'},
         { identifier: 'within', label: 'within', value: '' }
       ]);
     });

From 7b33d30bc697c1b93d417c0a2efae04a14c93292 Mon Sep 17 00:00:00 2001
From: Rashmi Singhal <rashmi.s.singhal@gmail.com>
Date: Fri, 28 Jul 2017 13:36:52 -0400
Subject: [PATCH 21/30] add specific test for checking manifest id

---
 spec/widgets/metadataView.test.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/widgets/metadataView.test.js b/spec/widgets/metadataView.test.js
index 585c0d4409..8cbe9d2a5f 100644
--- a/spec/widgets/metadataView.test.js
+++ b/spec/widgets/metadataView.test.js
@@ -115,6 +115,9 @@ describe('MetadataView', function() {
   });
 
   describe('getMetadataLinks', function() {
+    it('should always display the manifest id', function() {
+      expect(subject.getMetadataLinks(this.manifest.jsonLd)[2].value).toContain('http://www.example.org/iiif/book1/manifest');
+    });
     it('should grab metadata links when present', function() {
       expect(subject.getMetadataLinks({
         related: "http://news.example.net",

From fdc706ef811c3ae69813c220a285ef90ae4dbcca Mon Sep 17 00:00:00 2001
From: knagasaki <nagasaki@dhii.jp>
Date: Tue, 1 Aug 2017 18:15:55 +0900
Subject: [PATCH 22/30] Initial Commit

---
 css/less/views/gallery-view.less |  5 +++++
 css/less/workspace.less          |  4 ++++
 index.html                       |  4 ++--
 js/src/manifests/manifest.js     |  4 ++++
 js/src/widgets/bookView.js       |  4 ++++
 js/src/widgets/imageView.js      |  8 ++++++--
 js/src/widgets/scrollView.js     |  4 ++++
 js/src/widgets/thumbnailsView.js | 14 ++++++++++++-
 js/src/workspaces/window.js      | 35 ++++++++++++++++++++++++++++++--
 9 files changed, 75 insertions(+), 7 deletions(-)

diff --git a/css/less/views/gallery-view.less b/css/less/views/gallery-view.less
index a5ea245383..cb1a26aeda 100644
--- a/css/less/views/gallery-view.less
+++ b/css/less/views/gallery-view.less
@@ -92,4 +92,9 @@
   .hud-control .ui-slider-range {
     background: @deep-sky-blue;
   }
+
+  .thumbnail-rtl{
+    float: right !important;
+  }
+
 }
diff --git a/css/less/workspace.less b/css/less/workspace.less
index 50b4499077..63ec968226 100644
--- a/css/less/workspace.less
+++ b/css/less/workspace.less
@@ -99,4 +99,8 @@
     left: 0;
     display: none;
   }
+
+  .v-direction-rtl {
+    direction: rtl;
+  }
 }
diff --git a/index.html b/index.html
index 8d9839d8bd..455ea0d1dd 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" type="text/css" href="build/mirador/css/mirador-combined.css">
+    <link rel="stylesheet" type="text/css" href="build/mirador/css/mirador-combined.min.css">
     <title>Mirador Viewer</title>
     <style type="text/css">
      #viewer {
@@ -16,7 +16,7 @@
   <body>
     <div id="viewer"></div>
 
-    <script src="build/mirador/mirador.js"></script>
+    <script src="build/mirador/mirador.min.js"></script>
     <script type="text/javascript">
 
      $(function() {
diff --git a/js/src/manifests/manifest.js b/js/src/manifests/manifest.js
index 3e3e738993..d2e4772ed0 100644
--- a/js/src/manifests/manifest.js
+++ b/js/src/manifests/manifest.js
@@ -252,6 +252,10 @@
         var canvas = this.canvasMap[canvasId.split('#')[0]];
         return canvas ? canvas.label : undefined;
       }
+    },
+    getViewingDirection : function(){
+        var _this = this;
+        return _this.jsonLd.viewingDirection;
     }
   };
 
diff --git a/js/src/widgets/bookView.js b/js/src/widgets/bookView.js
index b87046124d..d149bb4c29 100755
--- a/js/src/widgets/bookView.js
+++ b/js/src/widgets/bookView.js
@@ -9,6 +9,7 @@
       stitchList:       [],
       canvasID:          null,
       imagesList:       [],
+      imagesListRtl:       [],
       element:          null,
       focusImages:      [],
       manifest:         null,
@@ -32,6 +33,9 @@
 
     init: function() {
       var _this = this;
+      if(this.vDirectionStatus == 'rtl'){
+          this.imagesList =  this.imagesListRtl.concat();
+      }
       if (this.canvasID !== null) {
         this.currentImgIndex = $.getImageIndexById(this.imagesList, this.canvasID);
       }
diff --git a/js/src/widgets/imageView.js b/js/src/widgets/imageView.js
index 177cb2f19f..9376c5cfd5 100755
--- a/js/src/widgets/imageView.js
+++ b/js/src/widgets/imageView.js
@@ -9,6 +9,7 @@
       canvasID:         null,
       canvases:         null,
       imagesList:       [],
+      imagesListRtl:    [],
       element:          null,
       elemOsd:          null,
       manifest:         null,
@@ -22,7 +23,8 @@
       annoCls:          'annotation-canvas',
       annotationsLayer: null,
       forceShowControls: false,
-      eventEmitter:     null
+      eventEmitter:     null,
+      vDirectionStatus: ''
     }, options);
 
     this.init();
@@ -34,7 +36,9 @@
       var _this = this;
       this.horizontallyFlipped = false;
       this.originalDragHandler = null;
-
+      if(this.vDirectionStatus == 'rtl'){
+          this.imagesList =  this.imagesListRtl.concat();
+       }
       // check (for thumbnail view) if the canvasID is set.
       // If not, make it page/item 1.
       if (this.canvasID !== null) {
diff --git a/js/src/widgets/scrollView.js b/js/src/widgets/scrollView.js
index 738f99a49a..a401523c9c 100755
--- a/js/src/widgets/scrollView.js
+++ b/js/src/widgets/scrollView.js
@@ -13,11 +13,15 @@
       thumbInfo:            {thumbsHeight: 150, listingCssCls: 'listing-thumbs', thumbnailCls: 'thumbnail-view'},
       windowId:             null,
       panel:                false,
+      vDirectionStatus: '',
       lazyLoadingFactor:    1.5  //should be >= 1
     }, options);
     
     jQuery.extend($.ScrollView.prototype, $.ThumbnailsView.prototype);
     this.init();
+    if(this.vDirectionStatus == 'rtl'){
+	jQuery('.scroll-view').addClass('v-direction-rtl');
+    }
   };
   
 }(Mirador));
diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js
index 46aab3ab71..a7e2b0b183 100755
--- a/js/src/widgets/thumbnailsView.js
+++ b/js/src/widgets/thumbnailsView.js
@@ -9,6 +9,8 @@
       manifest:             null,
       element:              null,
       imagesList:           [],
+      imagesListLtr:           [],
+      vDirectionStatus:           '',
       appendTo:             null,
       thumbInfo:            {thumbsHeight: 150, listingCssCls: 'listing-thumbs', thumbnailCls: 'thumbnail-view'},
       defaultThumbHeight:   150,
@@ -28,8 +30,18 @@
       if (this.canvasID !== null) {
         this.currentImgIndex = $.getImageIndexById(this.imagesList, this.canvasID);
       }
-
+      if(this.vDirectionStatus == 'rtl'){
+	  this.imagesList =  this.imagesListLtr.concat();
+      }
       this.loadContent();
+      if(this.vDirectionStatus == 'rtl'){
+	 var fCanvasId = this.imagesList[0]['@id'];
+	 var fCanvasThumSelector = 'img.thumbnail-image[data-image-id="'+fCanvasId+'"]';
+         jQuery(fCanvasThumSelector).parents('.panel-thumbnail-view').addClass('v-direction-rtl');
+         jQuery(fCanvasThumSelector).parents('.thumbnail-view').find('li').each(function(){
+            jQuery(this).addClass('thumbnail-rtl');
+         });
+      }
       this.bindEvents();
       this.listenForActions();
     },
diff --git a/js/src/workspaces/window.js b/js/src/workspaces/window.js
index c9c043c83b..2e05737922 100644
--- a/js/src/workspaces/window.js
+++ b/js/src/workspaces/window.js
@@ -83,6 +83,13 @@
       _this.removeBookView();
 
       //reset imagemodes and then remove any imageModes that are not available as a focus
+//add getting rtl value
+      if(_this.manifest.getViewingDirection() == 'right-to-left'){
+        _this.vDirectionStatus = 'rtl';
+      }
+      else{
+        _this.vDirectionStatus = '';
+      } 	
       this.imageModes = this.originalImageModes;
       this.imageModes = jQuery.map(this.imageModes, function(value, index) {
         if (jQuery.inArray(value, _this.focuses) === -1) return null;
@@ -95,7 +102,15 @@
         _this.canvasID = _this.imagesList[0]['@id'];
       }
       _this.canvases = _this.buildCanvasesIndex(_this.manifest.getCanvases());
-
+      if(_this.vDirectionStatus == 'rtl'){
+          _this.imagesListLtr = _this.imagesList.concat();
+	  _this.imagesListRtl = _this.imagesList.concat();
+	  _this.imagesListRtl.reverse();
+      }
+      else{
+          _this.imagesListRtl = [];
+          _this.imagesListLtr = [];
+      }
       this.annoEndpointAvailable = !jQuery.isEmptyObject(_this.state.getStateProperty('annotationEndpoint'));
       if (!this.canvasControls.annotations.annotationLayer) {
         this.canvasControls.annotations.annotationCreation = false;
@@ -535,6 +550,9 @@
               canvasID: _this.canvasID,
               canvases: _this.canvases,
               imagesList: _this.imagesList,
+              imagesListLtr: _this.imagesListLtr,
+              imagesListRtl: _this.imagesListRtl,
+	      vDirectionStatus: _this.vDirectionStatus,		
               thumbInfo: {thumbsHeight: 80, listingCssCls: 'panel-listing-thumbs', thumbnailCls: 'panel-thumbnail-view'}
             });
           }
@@ -732,7 +750,9 @@
           eventEmitter: this.eventEmitter,
           windowId: this.id,
           canvasID: this.canvasID,
-          imagesList: this.imagesList
+          imagesList: this.imagesList,
+          imagesListLtr: this.imagesListLtr,
+          vDirectionStatus: this.vDirectionStatus
         });
       } else {
         var view = this.focusModules.ThumbnailsView;
@@ -754,6 +774,9 @@
           canvasID: canvasID,
           canvases: this.canvases,
           imagesList: this.imagesList,
+          imagesListRtl: this.imagesListRtl,
+          imagesListLtr: this.imagesListLtr,
+          vDirectionStatus: this.vDirectionStatus,
           osdOptions: this.windowOptions,
           bottomPanelAvailable: this.bottomPanelAvailable,
           annoEndpointAvailable: this.annoEndpointAvailable,
@@ -777,6 +800,9 @@
           eventEmitter: this.eventEmitter,
           canvasID: canvasID,
           imagesList: this.imagesList,
+          imagesListRtl: this.imagesListRtl,
+          imagesListLtr: this.imagesListLtr,
+          vDirectionStatus: this.vDirectionStatus,
           osdOptions: this.windowOptions,
           bottomPanelAvailable: this.bottomPanelAvailable
         });
@@ -788,6 +814,9 @@
     },
 
     toggleScrollView: function(canvasID) {
+      if(this.vDirectionStatus == 'rtl'){
+          this.imagesList = this.imagesListRtl.concat();
+      }
       this.canvasID = canvasID;
       if (this.focusModules.ScrollView === null) {
         var containerHeight = this.element.find('.view-container').height();
@@ -799,6 +828,8 @@
           windowId: this.id,
           canvasID: this.canvasID,
           imagesList: this.imagesList,
+          imagesListLtr: this.imagesListLtr,
+          vDirectionStatus: this.vDirectionStatus,
           thumbInfo: {thumbsHeight: Math.floor(containerHeight * this.scrollImageRatio), listingCssCls: 'scroll-listing-thumbs', thumbnailCls: 'scroll-view'}
         });
       } else {

From 4cb9d07b77a8e4731ecff8b42d3016c89402faf3 Mon Sep 17 00:00:00 2001
From: regisrob <regisrobineau@gmail.com>
Date: Sat, 12 Aug 2017 18:41:56 +0200
Subject: [PATCH 23/30] Restore div in order to pass the test

---
 js/src/widgets/searchWithinResults.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/js/src/widgets/searchWithinResults.js b/js/src/widgets/searchWithinResults.js
index 7b5be56a3d..4b603904f2 100644
--- a/js/src/widgets/searchWithinResults.js
+++ b/js/src/widgets/searchWithinResults.js
@@ -437,12 +437,14 @@ $.SearchWithinResults.prototype = {
             '{{canvaslabel}}',
           '</a>',
           '{{#if annotations}}',
-            '<em>Annotations</em>: ',
-            '{{#each annotations}}',
-              '<a class="search-result search-annotation js-show-canvas" data-canvasid="{{canvasid}}" data-coordinates="{{coordinates}}">',
-                '<i class="fa fa-fw" aria-hidden="true"></i>',
-              '</a>',
-            '{{/each}}',
+            '<div>',
+              '<em>Annotations</em>: ',
+              '{{#each annotations}}',
+                '<a class="search-result search-annotation js-show-canvas" data-canvasid="{{canvasid}}" data-coordinates="{{coordinates}}">',
+                  '<i class="fa fa-fw" aria-hidden="true"></i>',
+                '</a>',
+              '{{/each}}',
+            '</div>',
           '{{/if}}',
           '<div class="search-result result-paragraph js-show-canvas" data-canvasid="{{canvasid}}" data-coordinates="{{coordinates}}">',
             '{{#if hit.before}}',

From 14dae3fbb6c4be250600db182f487bbb73745a5f Mon Sep 17 00:00:00 2001
From: Rashmi Singhal <rashmi.s.singhal@gmail.com>
Date: Fri, 18 Aug 2017 11:58:59 -0400
Subject: [PATCH 24/30] =?UTF-8?q?fixes=20to=20the=20CSS=20so=20it=20doesn?=
 =?UTF-8?q?=E2=80=99t=20hard=20code=20=E2=80=9CAdd=20Item=E2=80=9D=20using?=
 =?UTF-8?q?=20pixels,=20but=20centers=20it=20vertically=20depending=20on?=
 =?UTF-8?q?=20the=20space=20available.=20=20Button=20for=20closing=20a=20s?=
 =?UTF-8?q?lot=20should=20still=20be=20absolutely=20positioned.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/less/window.less      |  3 ++-
 css/less/workspace.less   |  7 ++++---
 js/src/workspaces/slot.js | 12 ++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/css/less/window.less b/css/less/window.less
index 0c127491de..fc81915560 100644
--- a/css/less/window.less
+++ b/css/less/window.less
@@ -1,10 +1,11 @@
 .mirador-container {
   .window {
-    position:relative;
+    position:absolute;
     width:100%;
     height:100%;
     overflow: hidden;
     background-color: @black-33;
+    top: 0%;
   }
 
   .manifest-info {
diff --git a/css/less/workspace.less b/css/less/workspace.less
index 50b4499077..8805d5f716 100644
--- a/css/less/workspace.less
+++ b/css/less/workspace.less
@@ -43,6 +43,7 @@
       color: @gray;
       text-align: center;
       font-weight: normal;
+      margin: 0px;
     }
 
     &:hover h1 {
@@ -53,13 +54,13 @@
   .plus {
     font-size: 170px;
     font-weight: bold;
-    margin-bottom: 20px;
+    margin-bottom: 2%;
   }
 
   .slotIconContainer {
-    position: absolute;
+    position: relative;
     top: 50%;
-    margin-top: -260px;
+    transform: translateY(-50%);
     width: 100%;
     overflow: hidden;
     pointer-events: none;
diff --git a/js/src/workspaces/slot.js b/js/src/workspaces/slot.js
index f5ff3ede1a..21dd5670b8 100644
--- a/js/src/workspaces/slot.js
+++ b/js/src/workspaces/slot.js
@@ -171,13 +171,13 @@
 
           _this.eventEmitter.publish('ADD_WINDOW', windowConfig);
 
-        } 
-        
+        }
+
         else if (typeof imageInfoUrl !== 'undefined') {
           if (!_this.state.getStateProperty('manifests')[imageInfoUrl]) {
             _this.eventEmitter.publish('ADD_MANIFEST_FROM_URL', [imageInfoUrl, "(Added from URL)"]);
           }
-        } 
+        }
         else if (typeof collectionUrl !== 'undefined'){
           jQuery.getJSON(collectionUrl).done(function (data, status, jqXHR) {
             if (data.hasOwnProperty('manifests')){
@@ -195,11 +195,11 @@
             }
           });
 
-          //TODO: 
+          //TODO:
           //this works;
           //but you might want to check if some "publish" action would be better
           _this.addItem();
-          
+
         }
         else {
           if (!_this.state.getStateProperty('manifests')[imageInfoUrl]) {
@@ -274,6 +274,7 @@
     // template should be based on workspace type
     template: $.Handlebars.compile([
                                  '<div id="{{slotID}}" class="{{workspaceSlotCls}}">',
+                                 '<a class="remove-slot-option"><i class="fa fa-times fa-lg fa-fw"></i> {{t "close"}}</a>',
                                  '<div class="slotIconContainer">',
                                  // '<a href="javascript:;" class="mirador-btn mirador-icon-window-menu" title="Replace object"><i class="fa fa-table fa-lg fa-fw"></i>',
                                  // '<ul class="dropdown slot-controls">',
@@ -298,7 +299,6 @@
                                  '<h1 class="dropMeMessage">{{t "dropToLoad"}}</h1>',
                                  '</div>',
                                  '<a class="addItemLink" role="button" aria-label="Add item"></a>',
-                                 '<a class="remove-slot-option"><i class="fa fa-times fa-lg fa-fw"></i> {{t "close"}}</a>',
       '<a class="dropMask"></a>',
                                  '</div>'
     ].join(''))

From 7a7e0ab8c4f110274c8995755dc29858880f8d4b Mon Sep 17 00:00:00 2001
From: Rashmi Singhal <rashmi.s.singhal@gmail.com>
Date: Fri, 18 Aug 2017 12:06:43 -0400
Subject: [PATCH 25/30] =?UTF-8?q?Don=E2=80=99t=20minimize=20the=20bottom?=
 =?UTF-8?q?=20panel=20when=20there=20is=20only=20image=20because=20it?=
 =?UTF-8?q?=E2=80=99s=20not=20working=20properly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/src/workspaces/window.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/workspaces/window.js b/js/src/workspaces/window.js
index c9c043c83b..fd1637971a 100644
--- a/js/src/workspaces/window.js
+++ b/js/src/workspaces/window.js
@@ -231,11 +231,13 @@
 
       this.bindEvents();
 
-      if (this.imagesList.length === 1) {
-        this.bottomPanelVisibility(false);
-      } else {
+      // For now, disable the check for a single image because minimizing the bottom panel
+      // is happening at the wrong time compared to the display/transformation of canvas controls
+      // if (this.imagesList.length === 1) {
+      //   this.bottomPanelVisibility(false);
+      // } else {
         this.bottomPanelVisibility(this.bottomPanelVisible);
-      }
+      // }
       this.sidePanelVisibility(this.sidePanelVisible, '0s');
 
       this.events.push(this.eventEmitter.subscribe('windowRemoved',function(event,id){

From d9808ea397b956ecc6e871eccd45d1312a8f3f2f Mon Sep 17 00:00:00 2001
From: Rashmi Singhal <rashmi.s.singhal@gmail.com>
Date: Fri, 18 Aug 2017 12:11:54 -0400
Subject: [PATCH 26/30] fix per #1418

---
 js/src/workspaces/window.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/js/src/workspaces/window.js b/js/src/workspaces/window.js
index fd1637971a..9a4c15e901 100644
--- a/js/src/workspaces/window.js
+++ b/js/src/workspaces/window.js
@@ -90,6 +90,9 @@
       });
 
       _this.imagesList = _this.manifest.getCanvases();
+      if (_this.imagesList.length === 1) {
+        _this.bottomPanelVisible = false;
+      }
       if (!_this.canvasID) {
         // By default, the first in the sequence is the selected Canvas
         _this.canvasID = _this.imagesList[0]['@id'];
@@ -231,13 +234,7 @@
 
       this.bindEvents();
 
-      // For now, disable the check for a single image because minimizing the bottom panel
-      // is happening at the wrong time compared to the display/transformation of canvas controls
-      // if (this.imagesList.length === 1) {
-      //   this.bottomPanelVisibility(false);
-      // } else {
-        this.bottomPanelVisibility(this.bottomPanelVisible);
-      // }
+      this.bottomPanelVisibility(this.bottomPanelVisible);
       this.sidePanelVisibility(this.sidePanelVisible, '0s');
 
       this.events.push(this.eventEmitter.subscribe('windowRemoved',function(event,id){

From 9db71da305967ecaf7ceb6db575188ae17499037 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Mon, 21 Aug 2017 09:40:47 +0200
Subject: [PATCH 27/30] Add missing german locales

---
 locales/de/translation.json | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/locales/de/translation.json b/locales/de/translation.json
index 2c68418819..e32ffbf037 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -29,6 +29,8 @@
     "deleteShape":"Wollen Sie diesen Marker löschen?",
     "description": "Beschreibung",
     "details": "Details",
+    "disabledLayersTabMessage": "Bildebenen sind nur in der Einzelbildanzeige verfügbar",
+    "disabledOpacityMessage": "deaktiviert",
     "dotDashed":"Punkte &amp; Striche",
     "dropToLoad": "Hier ablegen um das Manifest zu laden",
     "edit": "Bearbeiten",
@@ -36,6 +38,7 @@
     "editModalBtnSaveWithoutShapes":"Annotation ohne Marker speichern",
     "editModalSaveAnnotationWithNoShapesMsg":"Mit dieser Annotation sind keine Marker verknüpft",
     "ellipseTooltip": "Oval",
+    "emptyTemplateMessage": "Auf diesem Canvas gibt es keine Bildebenen",
     "fillColorTooltip": "Füllfarbe wählen",
     "filterObjects": "Objekte filtern",
     "freehandTooltip": "Freihand",
@@ -44,6 +47,7 @@
     "fullScreenWindowTooltip": "Dieses Fenster als Vollbild anzeigen",
     "grayscaleTooltip": "Graustufen umstellen",
     "imageManipulationTooltip": "Bild-Manipulation",
+    "imagesFor": "Bilder für",
     "imageView": "Einzelbild",
     "invertTooltip": "Farben umkehren",
     "item": "Objekt",
@@ -52,12 +56,15 @@
     "links": "Links",
     "load": "Laden",
     "logo": "Logo",
+    "manifest": "IIIF-Manifest",
     "metadataTooltip": "Informationen/Metadaten über dieses Objekt anzeigen",
+    "mirrorTooltip": "Bild spiegeln",
     "more": "mehr",
     "newObject": "Neues Objekt",
     "no": "Nein",
     "noIndex": "Kein Inhaltsverzeichnis verfügbar",
     "objectMetadata": "Metadaten des Objekts",
+    "opacityLabel": "Deckkraft",
     "pinTooltip": "Stecknadel",
     "pointerTooltip": "Auswählen",
     "polygonTooltip": "Polygon",
@@ -71,16 +78,23 @@
     "saturationTooltip": "Sättigung anpassen",
     "save": "Speichern",
     "scrollView": "Horizontales Scrollen",
+    "searchLabelSelect": "Suchdienst auswählen",
+    "searchNotAvailable": "Kein Suchdienst verfügbar",
+    "searchText": "Suchtext",
     "seeAlso": "Siehe auch",
     "selectGrid": "Anordnung auswählen",
     "sidePanelTooltip": "Seitenleiste",
     "solid": "Durchgängig",
+    "tabTitleIndex": "Index",
+    "tabTitleLayers": "Ebenen",
+    "tabTitleSearch": "Suche",
     "thick": "Dick",
     "thickest": "Dicker",
     "thumbnailsView": "Galerie",
     "unspecified": "nicht spezifiziert",
     "url": "URL",
     "viewTypeTooltip": "Ansichtstyp wechseln",
+    "visibleLabel": "sichtbar",
     "within": "Teil von",
     "yes": "Ja"
 }

From 0843659cdffb0f2d81096acd06a7ba47a919692b Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Mon, 21 Aug 2017 10:52:25 +0200
Subject: [PATCH 28/30] Add missing translations

---
 js/src/widgets/layersTab.js |  2 +-
 js/src/widgets/searchTab.js | 12 ++++++------
 locales/de/translation.json |  3 +++
 locales/en/translation.json |  3 +++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/js/src/widgets/layersTab.js b/js/src/widgets/layersTab.js
index 36b228331e..eb6b74853b 100644
--- a/js/src/widgets/layersTab.js
+++ b/js/src/widgets/layersTab.js
@@ -169,7 +169,7 @@
                 disabledOpacityMessage: i18next.t('disabledOpacityMessage'),
                 emptyTemplateMessage: i18next.t('emptyTemplateMessage'),
                 imageId: imageResource.id,
-                title: imageResource.label,
+                title: imageResource.label === 'No Label' ? i18next.t('noLabel') : imageResource.label,
                 opacity: imageResource.getOpacity()*100, // scale factor for limitations of html5 slider element
                 loadingStatus: imageResource.getStatus(),
                 visibility: imageResource.getVisible(),
diff --git a/js/src/widgets/searchTab.js b/js/src/widgets/searchTab.js
index 4c178e9dee..2c960a7df6 100644
--- a/js/src/widgets/searchTab.js
+++ b/js/src/widgets/searchTab.js
@@ -116,11 +116,11 @@
 
         _this.element.find(".js-search-expanded").slideToggle("fast");
 
-        if (jQuery(this).text() === "more"){
-          jQuery(this).html("less");
+        if (jQuery(this).text() === i18next.t("more")){
+          jQuery(this).text(i18next.t("less"));
         }
-        else if (jQuery(this).text() === "less"){
-          jQuery(this).html("more");
+        else if (jQuery(this).text() === i18next.t("less")){
+          jQuery(this).text(i18next.t("more"));
         }
       });
 
@@ -168,9 +168,9 @@
           '<form id="search-within-form" class="js-perform-query">',
             '<input class="js-query" type="text" placeholder="{{t "searchText"}}"/>',
 
-            '<input style="margin: 10px 0" type="submit"/>',
+            '<input style="margin: 10px 0" type="submit" value="{{t "submit"}}"/>',
 
-            '<a class="js-search-expand" style="display: block; margin: 0 0 5px 0">more</a>',
+            '<a class="js-search-expand" style="display: block; margin: 0 0 5px 0">{{t "more"}}</a>',
             '<div class="js-search-expanded" style="display: none;">',
               '<input class="js-motivation" type="text" placeholder="motivation"/>',
               '<input class="js-date" type="text" placeholder="date"/>',
diff --git a/locales/de/translation.json b/locales/de/translation.json
index e32ffbf037..033d39b71c 100644
--- a/locales/de/translation.json
+++ b/locales/de/translation.json
@@ -52,6 +52,7 @@
     "invertTooltip": "Farben umkehren",
     "item": "Objekt",
     "items": "Objekte",
+    "less": "weniger",
     "license": "Lizenz",
     "links": "Links",
     "load": "Laden",
@@ -63,6 +64,7 @@
     "newObject": "Neues Objekt",
     "no": "Nein",
     "noIndex": "Kein Inhaltsverzeichnis verfügbar",
+    "noLabel": "Kein Label",
     "objectMetadata": "Metadaten des Objekts",
     "opacityLabel": "Deckkraft",
     "pinTooltip": "Stecknadel",
@@ -85,6 +87,7 @@
     "selectGrid": "Anordnung auswählen",
     "sidePanelTooltip": "Seitenleiste",
     "solid": "Durchgängig",
+    "submit": "Senden",
     "tabTitleIndex": "Index",
     "tabTitleLayers": "Ebenen",
     "tabTitleSearch": "Suche",
diff --git a/locales/en/translation.json b/locales/en/translation.json
index 5cfff86fb1..f9a3c88f5d 100644
--- a/locales/en/translation.json
+++ b/locales/en/translation.json
@@ -53,6 +53,7 @@
   "item": "item",
   "items": "items",
   "label": "Label",
+  "less": "less",
   "license": "License",
   "links": "Links",
   "load": "Load",
@@ -64,6 +65,7 @@
   "newObject": "Replace Object",
   "no": "No",
   "noIndex": "No index available",
+  "noLabel": "No Label",
   "objectMetadata": "Object Metadata",
   "opacityLabel": "opacity",
   "pinTooltip": "Pin annotation",
@@ -86,6 +88,7 @@
   "selectGrid": "Select a grid below",
   "sidePanelTooltip": "Toggle the side panel",
   "solid": "Solid",
+  "submit": "Submit",
   "tabTitleIndex": "Index",
   "tabTitleLayers": "Layers",
   "tabTitleSearch": "Search",

From 2777ca8fb0991c067c5ee5c71a50de01e1c1c184 Mon Sep 17 00:00:00 2001
From: Matthias Lindinger <matthias.lindinger@bsb-muenchen.de>
Date: Mon, 21 Aug 2017 11:42:29 +0200
Subject: [PATCH 29/30] Optimize html structure of the search tab

---
 js/src/widgets/searchTab.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/widgets/searchTab.js b/js/src/widgets/searchTab.js
index 4c178e9dee..f89a28efb3 100644
--- a/js/src/widgets/searchTab.js
+++ b/js/src/widgets/searchTab.js
@@ -170,7 +170,7 @@
 
             '<input style="margin: 10px 0" type="submit"/>',
 
-            '<a class="js-search-expand" style="display: block; margin: 0 0 5px 0">more</a>',
+            '<div style="margin-bottom: 5px"><a class="js-search-expand" href="#">more</a></div>',
             '<div class="js-search-expanded" style="display: none;">',
               '<input class="js-motivation" type="text" placeholder="motivation"/>',
               '<input class="js-date" type="text" placeholder="date"/>',

From 6e15d6910938ff7da34670c64e079096b25dad1f Mon Sep 17 00:00:00 2001
From: aeschylus <scipioaffricanus@gmail.com>
Date: Thu, 14 Sep 2017 16:26:34 -0700
Subject: [PATCH 30/30] add tests, adjust some code to fix spelling errors and
 testability

---
 css/less/window.less                |   4 +
 css/less/workspace.less             |   6 +-
 index.html                          |   4 +-
 js/src/manifests/manifest.js        |   7 +-
 js/src/widgets/bookView.js          |  96 +++++++--------
 js/src/widgets/scrollView.js        |   8 +-
 js/src/widgets/thumbnailsView.js    |  15 ++-
 js/src/workspaces/window.js         | 178 ++++++++++++++--------------
 spec/manifests/manifest.test.js     |  43 ++++++-
 spec/widgets/bookView.test.js       |  29 +++++
 spec/widgets/imageView.test.js      |  30 ++++-
 spec/widgets/scrollView.test.js     |  16 ++-
 spec/widgets/thumbnailsView.test.js |  26 +++-
 spec/workspaces/window.test.js      |  72 ++++++-----
 14 files changed, 335 insertions(+), 199 deletions(-)

diff --git a/css/less/window.less b/css/less/window.less
index fc81915560..b3b372bbaf 100644
--- a/css/less/window.less
+++ b/css/less/window.less
@@ -98,4 +98,8 @@
     margin: 0px;
     height: 0px;
   }
+
+  .v-direction-rtl {
+    direction: rtl;
+  }
 }
diff --git a/css/less/workspace.less b/css/less/workspace.less
index d8adfb70b2..1102b87746 100644
--- a/css/less/workspace.less
+++ b/css/less/workspace.less
@@ -100,8 +100,4 @@
     left: 0;
     display: none;
   }
-
-  .v-direction-rtl {
-    direction: rtl;
-  }
-}
+}
\ No newline at end of file
diff --git a/index.html b/index.html
index 455ea0d1dd..8d9839d8bd 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <link rel="stylesheet" type="text/css" href="build/mirador/css/mirador-combined.min.css">
+    <link rel="stylesheet" type="text/css" href="build/mirador/css/mirador-combined.css">
     <title>Mirador Viewer</title>
     <style type="text/css">
      #viewer {
@@ -16,7 +16,7 @@
   <body>
     <div id="viewer"></div>
 
-    <script src="build/mirador/mirador.min.js"></script>
+    <script src="build/mirador/mirador.js"></script>
     <script type="text/javascript">
 
      $(function() {
diff --git a/js/src/manifests/manifest.js b/js/src/manifests/manifest.js
index d2e4772ed0..228966e070 100644
--- a/js/src/manifests/manifest.js
+++ b/js/src/manifests/manifest.js
@@ -253,9 +253,10 @@
         return canvas ? canvas.label : undefined;
       }
     },
-    getViewingDirection : function(){
-        var _this = this;
-        return _this.jsonLd.viewingDirection;
+    getViewingDirection : function() {
+      var _this = this;
+      return _this.jsonLd.viewingDirection || _this.jsonLd.sequences[0].viewingDirection;
+
     }
   };
 
diff --git a/js/src/widgets/bookView.js b/js/src/widgets/bookView.js
index d149bb4c29..f72df6da27 100755
--- a/js/src/widgets/bookView.js
+++ b/js/src/widgets/bookView.js
@@ -34,7 +34,7 @@
     init: function() {
       var _this = this;
       if(this.vDirectionStatus == 'rtl'){
-          this.imagesList =  this.imagesListRtl.concat();
+        this.imagesList =  this.imagesListRtl.concat();
       }
       if (this.canvasID !== null) {
         this.currentImgIndex = $.getImageIndexById(this.imagesList, this.canvasID);
@@ -83,14 +83,14 @@
     },
 
     template: $.Handlebars.compile([
-                                 '<div class="book-view">',
-                                 '</div>'
+      '<div class="book-view">',
+      '</div>'
     ].join('')),
 
     listenForActions: function() {
       var _this = this,
-      firstCanvasId = _this.imagesList[0]['@id'],
-      lastCanvasId = _this.imagesList[_this.imagesList.length-1]['@id'];
+          firstCanvasId = _this.imagesList[0]['@id'],
+          lastCanvasId = _this.imagesList[_this.imagesList.length-1]['@id'];
 
       _this.eventEmitter.subscribe('bottomPanelSet.' + _this.windowId, function(event, visible) {
         var dodgers = _this.element.find('.mirador-osd-toggle-bottom-panel, .mirador-pan-zoom-controls');
@@ -125,7 +125,7 @@
       });
     },
 
-bindEvents: function() {
+    bindEvents: function() {
       var _this = this;
 
       this.element.find('.mirador-osd-next').on('click', function() {
@@ -200,12 +200,12 @@ bindEvents: function() {
       this.osdOptions.osdBounds = this.osd.viewport.getBounds(true);
       _this.eventEmitter.publish("imageBoundsUpdated", {
         id: _this.windowId,
-          osdBounds: {
-            x: _this.osdOptions.osdBounds.x,
-            y: _this.osdOptions.osdBounds.y,
-            width: _this.osdOptions.osdBounds.width,
-            height: _this.osdOptions.osdBounds.height
-          }
+        osdBounds: {
+          x: _this.osdOptions.osdBounds.x,
+          y: _this.osdOptions.osdBounds.y,
+          width: _this.osdOptions.osdBounds.width,
+          height: _this.osdOptions.osdBounds.height
+        }
       });
     },
 
@@ -269,19 +269,19 @@ bindEvents: function() {
 
     createOpenSeadragonInstance: function() {
       var uniqueID = $.genUUID(),
-      osdId = 'mirador-osd-' + uniqueID,
-      osdToolBarId = osdId + '-toolbar',
-      elemOsd,
-      tileSources = [],
-      _this = this,
-      toolbarID = 'osd-toolbar-' + uniqueID,
-      dfd = jQuery.Deferred();
+          osdId = 'mirador-osd-' + uniqueID,
+          osdToolBarId = osdId + '-toolbar',
+          elemOsd,
+          tileSources = [],
+          _this = this,
+          toolbarID = 'osd-toolbar-' + uniqueID,
+          dfd = jQuery.Deferred();
 
       this.element.find('.' + this.osdCls).remove();
 
       jQuery.each(this.stitchList, function(index, image) {
         var imageUrl = $.Iiif.getImageUrl(image),
-        infoJsonUrl = imageUrl + '/info.json';
+            infoJsonUrl = imageUrl + '/info.json';
 
         jQuery.getJSON(infoJsonUrl).done(function (data, status, jqXHR) {
           tileSources.splice(index, 0, data);
@@ -294,9 +294,9 @@ bindEvents: function() {
 
         elemOsd =
           jQuery('<div/>')
-        .addClass(_this.osdCls)
-        .attr('id', osdId)
-        .appendTo(_this.element);
+          .addClass(_this.osdCls)
+          .attr('id', osdId)
+          .appendTo(_this.element);
 
         _this.osd = $.OpenSeadragon({
           'id':           elemOsd.attr('id'),
@@ -406,11 +406,11 @@ bindEvents: function() {
       // Default to 'paged' and 'left-to-right'
       // Set index(es) for any other images to stitch with selected image
       var stitchList = [],
-      leftIndex = [],
-      rightIndex = [],
-      topIndex = [],
-      bottomIndex = [],
-      _this = this;
+          leftIndex = [],
+          rightIndex = [],
+          topIndex = [],
+          bottomIndex = [],
+          _this = this;
 
       this.focusImages = [];
 
@@ -425,46 +425,46 @@ bindEvents: function() {
         } else if (this.currentImgIndex % 2 === 0) {
           // even, get previous page.  set order in array based on viewingDirection
           switch (this.viewingDirection) {
-            case "left-to-right":
-              leftIndex[0] = this.currentImgIndex-1;
+          case "left-to-right":
+            leftIndex[0] = this.currentImgIndex-1;
             stitchList = [this.imagesList[this.currentImgIndex-1], this.currentImg];
             break;
-            case "right-to-left":
-              rightIndex[0] = this.currentImgIndex-1;
+          case "right-to-left":
+            rightIndex[0] = this.currentImgIndex-1;
             stitchList = [this.currentImg, this.imagesList[this.currentImgIndex-1]];
             break;
-            case "top-to-bottom":
-              topIndex[0] = this.currentImgIndex-1;
+          case "top-to-bottom":
+            topIndex[0] = this.currentImgIndex-1;
             stitchList = [this.imagesList[this.currentImgIndex-1], this.currentImg];
             break;
-            case "bottom-to-top":
-              bottomIndex[0] = this.currentImgIndex-1;
+          case "bottom-to-top":
+            bottomIndex[0] = this.currentImgIndex-1;
             stitchList = [this.currentImg, this.imagesList[this.currentImgIndex-1]];
             break;
-            default:
-              break;
+          default:
+            break;
           }
         } else {
           // odd, get next page
           switch (this.viewingDirection) {
-            case "left-to-right":
-              rightIndex[0] = this.currentImgIndex+1;
+          case "left-to-right":
+            rightIndex[0] = this.currentImgIndex+1;
             stitchList = [this.currentImg, this.imagesList[this.currentImgIndex+1]];
             break;
-            case "right-to-left":
-              leftIndex[0] = this.currentImgIndex+1;
+          case "right-to-left":
+            leftIndex[0] = this.currentImgIndex+1;
             stitchList = [this.imagesList[this.currentImgIndex+1], this.currentImg];
             break;
-            case "top-to-bottom":
-              bottomIndex[0] = this.currentImgIndex+1;
+          case "top-to-bottom":
+            bottomIndex[0] = this.currentImgIndex+1;
             stitchList = [this.currentImg, this.imagesList[this.currentImgIndex+1]];
             break;
-            case "bottom-to-top":
-              topIndex[0] = this.currentImgIndex+1;
+          case "bottom-to-top":
+            topIndex[0] = this.currentImgIndex+1;
             stitchList = [this.imagesList[this.currentImgIndex+1], this.currentImg];
             break;
-            default:
-              break;
+          default:
+            break;
           }
         }
       } else if (this.viewingHint === 'continuous') {
diff --git a/js/src/widgets/scrollView.js b/js/src/widgets/scrollView.js
index a401523c9c..5c7b05b6de 100755
--- a/js/src/widgets/scrollView.js
+++ b/js/src/widgets/scrollView.js
@@ -16,12 +16,12 @@
       vDirectionStatus: '',
       lazyLoadingFactor:    1.5  //should be >= 1
     }, options);
-    
+
     jQuery.extend($.ScrollView.prototype, $.ThumbnailsView.prototype);
     this.init();
-    if(this.vDirectionStatus == 'rtl'){
-	jQuery('.scroll-view').addClass('v-direction-rtl');
+    if(this.vDirectionStatus == 'rtl') {
+      jQuery(this.appendTo).find('.scroll-view').addClass('v-direction-rtl');
     }
   };
-  
+
 }(Mirador));
diff --git a/js/src/widgets/thumbnailsView.js b/js/src/widgets/thumbnailsView.js
index a7e2b0b183..052ba9f10f 100755
--- a/js/src/widgets/thumbnailsView.js
+++ b/js/src/widgets/thumbnailsView.js
@@ -23,7 +23,6 @@
     this.init();
   };
 
-
   $.ThumbnailsView.prototype = {
 
     init: function() {
@@ -31,16 +30,16 @@
         this.currentImgIndex = $.getImageIndexById(this.imagesList, this.canvasID);
       }
       if(this.vDirectionStatus == 'rtl'){
-	  this.imagesList =  this.imagesListLtr.concat();
+        this.imagesList =  this.imagesListLtr.concat();
       }
       this.loadContent();
       if(this.vDirectionStatus == 'rtl'){
-	 var fCanvasId = this.imagesList[0]['@id'];
-	 var fCanvasThumSelector = 'img.thumbnail-image[data-image-id="'+fCanvasId+'"]';
-         jQuery(fCanvasThumSelector).parents('.panel-thumbnail-view').addClass('v-direction-rtl');
-         jQuery(fCanvasThumSelector).parents('.thumbnail-view').find('li').each(function(){
-            jQuery(this).addClass('thumbnail-rtl');
-         });
+        var firstCanvasId = this.imagesList[0]['@id'];
+        var firstCanvasThumbSelector = 'img.thumbnail-image[data-image-id="'+firstCanvasId+'"]';
+        jQuery(this.appendTo).find('.panel-thumbnail-view').addClass('v-direction-rtl');
+        jQuery(this.appendTo).find('.thumbnail-view').find('li').each(function(){
+          jQuery(this).addClass('thumbnail-rtl');
+        });
       }
       this.bindEvents();
       this.listenForActions();
diff --git a/js/src/workspaces/window.js b/js/src/workspaces/window.js
index 0662cb7eff..f071c618db 100644
--- a/js/src/workspaces/window.js
+++ b/js/src/workspaces/window.js
@@ -83,13 +83,13 @@
       _this.removeBookView();
 
       //reset imagemodes and then remove any imageModes that are not available as a focus
-//add getting rtl value
+      //add getting rtl value
       if(_this.manifest.getViewingDirection() == 'right-to-left'){
         _this.vDirectionStatus = 'rtl';
       }
       else{
         _this.vDirectionStatus = '';
-      } 	
+      }
       this.imageModes = this.originalImageModes;
       this.imageModes = jQuery.map(this.imageModes, function(value, index) {
         if (jQuery.inArray(value, _this.focuses) === -1) return null;
@@ -106,13 +106,13 @@
       }
       _this.canvases = _this.buildCanvasesIndex(_this.manifest.getCanvases());
       if(_this.vDirectionStatus == 'rtl'){
-          _this.imagesListLtr = _this.imagesList.concat();
-	  _this.imagesListRtl = _this.imagesList.concat();
-	  _this.imagesListRtl.reverse();
+        _this.imagesListLtr = _this.imagesList.concat();
+        _this.imagesListRtl = _this.imagesList.concat();
+        _this.imagesListRtl.reverse();
       }
       else{
-          _this.imagesListRtl = [];
-          _this.imagesListLtr = [];
+        _this.imagesListRtl = [];
+        _this.imagesListLtr = [];
       }
       this.annoEndpointAvailable = !jQuery.isEmptyObject(_this.state.getStateProperty('annotationEndpoint'));
       if (!this.canvasControls.annotations.annotationLayer) {
@@ -551,7 +551,7 @@
               imagesList: _this.imagesList,
               imagesListLtr: _this.imagesListLtr,
               imagesListRtl: _this.imagesListRtl,
-	      vDirectionStatus: _this.vDirectionStatus,		
+              vDirectionStatus: _this.vDirectionStatus,		
               thumbInfo: {thumbsHeight: 80, listingCssCls: 'panel-listing-thumbs', thumbnailCls: 'panel-thumbnail-view'}
             });
           }
@@ -782,9 +782,9 @@
           canvasControls: this.canvasControls,
           annotationState : this.canvasControls.annotations.annotationState
         });
-        } else {
-          this.focusModules.ImageView.updateImage(canvasID);
-        }
+      } else {
+        this.focusModules.ImageView.updateImage(canvasID);
+      }
       this.toggleFocus('ImageView', 'ImageView');
     },
 
@@ -814,7 +814,7 @@
 
     toggleScrollView: function(canvasID) {
       if(this.vDirectionStatus == 'rtl'){
-          this.imagesList = this.imagesListRtl.concat();
+        this.imagesList = this.imagesListRtl.concat();
       }
       this.canvasID = canvasID;
       if (this.focusModules.ScrollView === null) {
@@ -1035,83 +1035,83 @@
     // template should be based on workspace type
 
     template: $.Handlebars.compile([
-         '<div class="window">',
-         '<div class="manifest-info">',
-         '<div class="window-manifest-navigation">',
-         '{{#if userButtons}}',
-           '{{windowuserbtns userButtons}}',
-         '{{/if}}',
-         '<a href="javascript:;" class="mirador-btn mirador-icon-view-type" role="button" title="{{t "viewTypeTooltip"}}" aria-label="{{t "viewTypeTooltip"}}">',
-         '<i class="{{currentFocusClass}}"></i>',
-         '<i class="fa fa-caret-down"></i>',
-         '<ul class="dropdown image-list">',
-         '{{#if ImageView}}',
-         '<li class="single-image-option"><i class="{{iconClasses.ImageView}}"></i> {{t "imageView"}}</li>',
-         '{{/if}}',
-         '{{#if BookView}}',
-         '<li class="book-option"><i class="{{iconClasses.BookView}}"></i> {{t "bookView"}}</li>',
-         '{{/if}}',
-         '{{#if ScrollView}}',
-         '<li class="scroll-option"><i class="{{iconClasses.ScrollView}}"></i> {{t "scrollView"}}</li>',
-         '{{/if}}',
-         '{{#if ThumbnailsView}}',
-         '<li class="thumbnails-option"><i class="{{iconClasses.ThumbnailsView}}"></i> {{t "thumbnailsView"}}</li>',
-         '{{/if}}',
-         '</ul>',
-         '</a>',
-         '{{#if MetadataView}}',
-         '<a href="javascript:;" class="mirador-btn mirador-icon-metadata-view mirador-tooltip" role="button" title="{{t "metadataTooltip"}}" aria-label="{{t "metadataTooltip"}}">',
-         '<i class="fa fa-info-circle fa-lg fa-fw"></i>',
-         '</a>',
-         '{{/if}}',
-         '{{#if showFullScreen}}',
-         '<a class="mirador-btn mirador-osd-fullscreen mirador-tooltip" role="button" title="{{t "fullScreenWindowTooltip"}}" aria-label="{{t "fullScreenWindowTooltip"}}">',
-         '<i class="fa fa-lg fa-fw fa-expand"></i>',
-         '</a>',
-         '{{/if}}',
-         '</div>',
-         '{{#if layoutOptions.close}}',
-         '<a href="javascript:;" class="mirador-btn mirador-close-window remove-object-option mirador-tooltip" title="{{t "closeTooltip"}}" aria-label="{{t "closeTooltip"}}"><i class="fa fa-times fa-lg fa-fw"></i></a>',
-         '{{/if}}',
-         '{{#if displayLayout}}',
-         '<a href="javascript:;" class="mirador-btn mirador-icon-window-menu" title="{{t "changeLayoutTooltip"}}" aria-label="{{t "changeLayoutTooltip"}}"><i class="fa fa-th-large fa-lg fa-fw"></i><i class="fa fa-caret-down"></i>',
-         '<ul class="dropdown slot-controls">',
-         '{{#if layoutOptions.newObject}}',
-         '<li class="new-object-option"><i class="fa fa-refresh fa-lg fa-fw"></i> {{t "newObject"}}</li>',
-         '<hr class="menu-divider"/>',
-         '{{/if}}',
-         '{{#if layoutOptions.slotRight}}',
-         '<li class="add-slot-right"><i class="fa fa-arrow-circle-right fa-lg fa-fw"></i> {{t "addSlotRight"}}</li>',
-         '{{/if}}',
-         '{{#if layoutOptions.slotLeft}}',
-         '<li class="add-slot-left"><i class="fa fa-arrow-circle-left fa-lg fa-fw"></i> {{t "addSlotLeft"}}</li>',
-         '{{/if}}',
-         '{{#if layoutOptions.slotAbove}}',
-         '<li class="add-slot-above"><i class="fa fa-arrow-circle-up fa-lg fa-fw"></i> {{t "addSlotAbove"}}</li>',
-         '{{/if}}',
-         '{{#if layoutOptions.slotBelow}}',
-         '<li class="add-slot-below"><i class="fa fa-arrow-circle-down fa-lg fa-fw"></i> {{t "addSlotBelow"}}</li>',
-         '{{/if}}',
-         '</ul>',
-         '</a>',
-         '{{/if}}',
-         '{{#if sidePanel}}',
-         '<a href="javascript:;" class="mirador-btn mirador-icon-toc selected mirador-tooltip" title="{{t "sidePanelTooltip"}}" aria-label="{{t "sidePanelTooltip"}}"><i class="fa fa-bars fa-lg fa-fw"></i></a>',
-         '{{/if}}',
-         '<h3 class="window-manifest-title" title="{{{title}}}" aria-label="{{{title}}}">{{{title}}}</h3>',
-         '</div>',
-         '<div class="content-container">',
-         '{{#if sidePanel}}',
-         '<div class="sidePanel">',
-         '</div>',
-         '{{/if}}',
-         '<div class="overlay"></div>',
-         '<div class="view-container {{#unless sidePanel}}focus-max-width{{/unless}}">',
-         '<div class="bottomPanel">',
-         '</div>',
-         '</div>',
-         '</div>',
-         '</div>'
+      '<div class="window">',
+      '<div class="manifest-info">',
+      '<div class="window-manifest-navigation">',
+      '{{#if userButtons}}',
+      '{{windowuserbtns userButtons}}',
+      '{{/if}}',
+      '<a href="javascript:;" class="mirador-btn mirador-icon-view-type" role="button" title="{{t "viewTypeTooltip"}}" aria-label="{{t "viewTypeTooltip"}}">',
+      '<i class="{{currentFocusClass}}"></i>',
+      '<i class="fa fa-caret-down"></i>',
+      '<ul class="dropdown image-list">',
+      '{{#if ImageView}}',
+      '<li class="single-image-option"><i class="{{iconClasses.ImageView}}"></i> {{t "imageView"}}</li>',
+      '{{/if}}',
+      '{{#if BookView}}',
+      '<li class="book-option"><i class="{{iconClasses.BookView}}"></i> {{t "bookView"}}</li>',
+      '{{/if}}',
+      '{{#if ScrollView}}',
+      '<li class="scroll-option"><i class="{{iconClasses.ScrollView}}"></i> {{t "scrollView"}}</li>',
+      '{{/if}}',
+      '{{#if ThumbnailsView}}',
+      '<li class="thumbnails-option"><i class="{{iconClasses.ThumbnailsView}}"></i> {{t "thumbnailsView"}}</li>',
+      '{{/if}}',
+      '</ul>',
+      '</a>',
+      '{{#if MetadataView}}',
+      '<a href="javascript:;" class="mirador-btn mirador-icon-metadata-view mirador-tooltip" role="button" title="{{t "metadataTooltip"}}" aria-label="{{t "metadataTooltip"}}">',
+      '<i class="fa fa-info-circle fa-lg fa-fw"></i>',
+      '</a>',
+      '{{/if}}',
+      '{{#if showFullScreen}}',
+      '<a class="mirador-btn mirador-osd-fullscreen mirador-tooltip" role="button" title="{{t "fullScreenWindowTooltip"}}" aria-label="{{t "fullScreenWindowTooltip"}}">',
+      '<i class="fa fa-lg fa-fw fa-expand"></i>',
+      '</a>',
+      '{{/if}}',
+      '</div>',
+      '{{#if layoutOptions.close}}',
+      '<a href="javascript:;" class="mirador-btn mirador-close-window remove-object-option mirador-tooltip" title="{{t "closeTooltip"}}" aria-label="{{t "closeTooltip"}}"><i class="fa fa-times fa-lg fa-fw"></i></a>',
+      '{{/if}}',
+      '{{#if displayLayout}}',
+      '<a href="javascript:;" class="mirador-btn mirador-icon-window-menu" title="{{t "changeLayoutTooltip"}}" aria-label="{{t "changeLayoutTooltip"}}"><i class="fa fa-th-large fa-lg fa-fw"></i><i class="fa fa-caret-down"></i>',
+      '<ul class="dropdown slot-controls">',
+      '{{#if layoutOptions.newObject}}',
+      '<li class="new-object-option"><i class="fa fa-refresh fa-lg fa-fw"></i> {{t "newObject"}}</li>',
+      '<hr class="menu-divider"/>',
+      '{{/if}}',
+      '{{#if layoutOptions.slotRight}}',
+      '<li class="add-slot-right"><i class="fa fa-arrow-circle-right fa-lg fa-fw"></i> {{t "addSlotRight"}}</li>',
+      '{{/if}}',
+      '{{#if layoutOptions.slotLeft}}',
+      '<li class="add-slot-left"><i class="fa fa-arrow-circle-left fa-lg fa-fw"></i> {{t "addSlotLeft"}}</li>',
+      '{{/if}}',
+      '{{#if layoutOptions.slotAbove}}',
+      '<li class="add-slot-above"><i class="fa fa-arrow-circle-up fa-lg fa-fw"></i> {{t "addSlotAbove"}}</li>',
+      '{{/if}}',
+      '{{#if layoutOptions.slotBelow}}',
+      '<li class="add-slot-below"><i class="fa fa-arrow-circle-down fa-lg fa-fw"></i> {{t "addSlotBelow"}}</li>',
+      '{{/if}}',
+      '</ul>',
+      '</a>',
+      '{{/if}}',
+      '{{#if sidePanel}}',
+      '<a href="javascript:;" class="mirador-btn mirador-icon-toc selected mirador-tooltip" title="{{t "sidePanelTooltip"}}" aria-label="{{t "sidePanelTooltip"}}"><i class="fa fa-bars fa-lg fa-fw"></i></a>',
+      '{{/if}}',
+      '<h3 class="window-manifest-title" title="{{{title}}}" aria-label="{{{title}}}">{{{title}}}</h3>',
+      '</div>',
+      '<div class="content-container">',
+      '{{#if sidePanel}}',
+      '<div class="sidePanel">',
+      '</div>',
+      '{{/if}}',
+      '<div class="overlay"></div>',
+      '<div class="view-container {{#unless sidePanel}}focus-max-width{{/unless}}">',
+      '<div class="bottomPanel">',
+      '</div>',
+      '</div>',
+      '</div>',
+      '</div>'
 
     ].join(''))
   };
diff --git a/spec/manifests/manifest.test.js b/spec/manifests/manifest.test.js
index 247d72d0aa..9c39ac7590 100644
--- a/spec/manifests/manifest.test.js
+++ b/spec/manifests/manifest.test.js
@@ -332,5 +332,46 @@ describe('Manifest', function() {
       }, 0);
     });
   });
-  
+
+  describe('getViewingDirection', function () {
+    it('should retrieve correct viewingDirection', function (done) {
+      var content1 = {
+        "@context": "http://www.shared-canvas.org/ns/context.json",
+        "@type": "sc:Manifest",
+        "@id": "http://manifests.example.com/iiif/EX/manifest",
+        "label": "Book 1",
+        "viewingDirection": "right-to-left",
+        "sequences": [{}]
+      };
+      var content2 = {
+        "@context": "http://www.shared-canvas.org/ns/context.json",
+        "@type": "sc:Manifest",
+        "@id": "http://manifests.example.com/iiif/EX/manifest",
+        "label": "Book 1",
+        "sequences": [{
+          "viewingDirection": 'right-to-left'
+        }]
+      };
+      var content3 = {
+        "@context": "http://www.shared-canvas.org/ns/context.json",
+        "@type": "sc:Manifest",
+        "@id": "http://manifests.example.com/iiif/EX/manifest",
+        "label": "Book 1",
+        "viewingDirection": "left-to-right",
+        "sequences": [{}]
+      };
+      var manifestInstance1 = new Mirador.Manifest(null, null, content1);
+      var manifestInstance2 = new Mirador.Manifest(null, null, content2);
+      var manifestInstance3 = new Mirador.Manifest(null, null, content3);
+      setTimeout(function () {
+        var viewingDirection1 = manifestInstance1.getViewingDirection();
+        var viewingDirection2 = manifestInstance2.getViewingDirection();
+        var viewingDirection3 = manifestInstance3.getViewingDirection();
+        expect(viewingDirection1).toEqual('right-to-left');
+        expect(viewingDirection2).toEqual('right-to-left');
+        expect(viewingDirection3).toEqual('left-to-right');
+        done();
+      }, 0);
+    });
+  });
 });
diff --git a/spec/widgets/bookView.test.js b/spec/widgets/bookView.test.js
index 9086abe47e..f4898f38e7 100644
--- a/spec/widgets/bookView.test.js
+++ b/spec/widgets/bookView.test.js
@@ -544,6 +544,35 @@ describe('BookView', function() {
         expect(subject.getStitchList()).toEqual([this.imagesList[6], this.imagesList[5]]);
       });
     });
+
+    describe('Order of imagesList', function() {
+      it('should be reversed for r-t-l sequences and manifests', function() {
+
+        this.fixture.viewingDirection = "right-to-left";
+        var manifest = new Mirador.Manifest(
+          this.fixture['@id'], 'IIIF', this.fixture
+        ),
+            imagesList = manifest.getCanvases(),
+            imagesListLtr = imagesList.concat(),
+            imagesListRtl = imagesList.concat();
+        imagesListRtl.reverse();
+        var bookView = new Mirador.BookView({
+          manifest: manifest,
+          appendTo: this.appendTo,
+          windowId: this.windowId,
+          eventEmitter: this.eventEmitter,
+          imagesList: imagesList,
+          imagesListLtr: imagesListLtr,
+          imagesListRtl: imagesListRtl,
+          state: this.state,
+          bottomPanelAvailable: true,
+          annoEndpointAvailable: true,
+          canvasControls: this.canvasControls,
+          annotationState: this.canvasControls.annotations.annotationState
+        });
+        expect(imagesList[imagesList.length - 1]).toBe(bookView.imagesListRtl[0]);
+      });
+    });
     // TODO: Fill this in once implemented
     describe('Continuous viewing hint', function() {
       beforeEach(function() {
diff --git a/spec/widgets/imageView.test.js b/spec/widgets/imageView.test.js
index f7518c74a9..81ec322b80 100644
--- a/spec/widgets/imageView.test.js
+++ b/spec/widgets/imageView.test.js
@@ -450,6 +450,34 @@ describe('ImageView', function() {
     // TODO: Find way to test annotation and manipulation tools without
     // "displayOn inappropriate in current state pointer" error
   });
+  describe('Order of imagesList', function() {
+    it('should be reversed for r-t-l sequences and manifests', function() {
+
+      this.fixture.viewingDirection = "right-to-left";
+      var manifest = new Mirador.Manifest(
+        this.fixture['@id'], 'IIIF', this.fixture
+      ),
+          imagesList = manifest.getCanvases(),
+          imagesListLtr = imagesList.concat(),
+          imagesListRtl = imagesList.concat();
+      imagesListRtl.reverse();
+      var imageView = new Mirador.ImageView({
+        manifest: manifest,
+        appendTo: this.appendTo,
+        windowId: this.windowId,
+        eventEmitter: this.eventEmitter,
+        imagesList: imagesList,
+        imagesListLtr: imagesListLtr,
+        imagesListRtl: imagesListRtl,
+        state: this.state,
+        bottomPanelAvailable: true,
+        annoEndpointAvailable: true,
+        canvasControls: this.canvasControls,
+        annotationState: this.canvasControls.annotations.annotationState
+      });
+      expect(imagesList[imagesList.length - 1]).toBe(imageView.imagesListRtl[0]);
+    });
+  });
 
   describe('getPanByValue', function() {
     beforeEach(function() {
@@ -459,7 +487,7 @@ describe('ImageView', function() {
             return viewportBounds;
           }
         }
-      }
+      };
     });
     it('should return half height and width', function() {
       expect(subject.getPanByValue().x).toBeCloseTo(viewportBounds.width/2 , 2);
diff --git a/spec/widgets/scrollView.test.js b/spec/widgets/scrollView.test.js
index d890c2a60a..fa6feb4ff2 100644
--- a/spec/widgets/scrollView.test.js
+++ b/spec/widgets/scrollView.test.js
@@ -1,6 +1,5 @@
 describe('ScrollView', function() {
   var subject;
-  
   beforeEach(function() {
     jasmine.getJSONFixtures().fixturesPath = 'spec/fixtures';
     this.viewContainer = document.createElement('div', {
@@ -26,11 +25,14 @@ describe('ScrollView', function() {
       windowId: this.windowId,
       eventEmitter: this.eventEmitter,
       imagesList: this.imagesList,
+      imagesListLtr: this.imagesList.concat(),
       state: this.state,
+      vDirectionStatus: 'rtl',
       bottomPanelAvailable: true,
       annoEndpointAvailable: false,
       canvasControls: this.canvasControls,
-      annotationState: this.canvasControls.annotations.annotationState
+      annotationState: this.canvasControls.annotations.annotationState,
+      thumbInfo: {listingCssCls: 'scroll-listing-thumbs', thumbnailCls: 'scroll-view'}
     });
     subject = this.scrollView;
   });
@@ -41,11 +43,13 @@ describe('ScrollView', function() {
 
   describe('Initialization', function() {
     it('should initialize', function() {
-      expect(true).toBe(true); //Force beforeEach() setup to run
+      expect(jQuery(subject.appendTo).find('.scroll-view')).toExist();
     });
   });
 
-  xdescribe('', function() {
-
+  describe('Right to Left scrollview', function() {
+    it('should have the correct CSS Class applied', function() {
+      expect(jQuery(subject.appendTo).find('.scroll-view')).toHaveClass('v-direction-rtl');
+    });
   });
-}); 
+});
diff --git a/spec/widgets/thumbnailsView.test.js b/spec/widgets/thumbnailsView.test.js
index 301ab1f7b4..a3149bd8e7 100644
--- a/spec/widgets/thumbnailsView.test.js
+++ b/spec/widgets/thumbnailsView.test.js
@@ -63,6 +63,28 @@ describe('ThumbnailsView', function () {
     });
   });
 
+  describe('r-t-l viewing', function() {
+    it('should add proper CSS to list items, floating right', function() {
+      var thumbnailsView = new Mirador.ThumbnailsView({
+        manifest: this.manifest,
+        appendTo: this.appendTo,
+        windowId: this.windowId,
+        eventEmitter: this.eventEmitter,
+        imagesList: this.imagesList,
+        imagesListLtr: this.imagesList.concat(),
+        vDirectionStatus: 'rtl',
+        state: this.state,
+        bottomPanelAvailable: true,
+        annoEndpointAvailable: false,
+        canvasControls: this.canvasControls,
+        annotationState: this.canvasControls.annotations.annotationState,
+        canvasId: this.imagesList[3]['@id']
+      });
+
+      expect(jQuery(thumbnailsView.appendTo).find('.thumbnail-view li')).toHaveClass('thumbnail-rtl');
+    });
+  });
+
   describe('loadContent', function () {
     beforeEach(function() {
       this.imagesList[this.imagesList.length-1].width = 0; // Zero out width of last canvas, as a test
@@ -275,7 +297,7 @@ describe('ThumbnailsView', function () {
       expect(subject.eventEmitter.publish).toHaveBeenCalledWith('ADD_CLASS.'+this.windowId, 'xekko');
     });
   });
-  
+
   describe('adjustHeight', function() {
     it('should remove class when hasClass is true', function() {
       subject.element.addClass('xekko');
@@ -288,4 +310,4 @@ describe('ThumbnailsView', function () {
       expect(subject.element.hasClass('xekko')).toBe(true);
     });
   });
-}); 
+});
diff --git a/spec/workspaces/window.test.js b/spec/workspaces/window.test.js
index a5aadd13cc..49acfcaee5 100644
--- a/spec/workspaces/window.test.js
+++ b/spec/workspaces/window.test.js
@@ -33,7 +33,8 @@ describe('Window', function() {
       });
 
       var state = new Mirador.SaveController(jQuery.extend(true, {}, Mirador.DEFAULT_SETTINGS, {eventEmitter:this.eventEmitter}));
-      this.window = new Mirador.Window(jQuery.extend(true,
+      this.window = new Mirador.Window(jQuery.extend(
+        true,
         {},
         state.getStateProperty('windowSettings'),
         {
@@ -46,7 +47,7 @@ describe('Window', function() {
                   canvases: [{
                     '@id': ''
                   }]
-              }]
+                }]
             },
             getCanvases: function() { return [{
               // This is an example of one canvas from richardson 7.
@@ -54,30 +55,30 @@ describe('Window', function() {
               width: 4680,
               '@type': "sc:Canvas",
               images: [{
-                  resource: {
-                    service: {
-                      profile: "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level1",
-                      '@context': "http://iiif.io/api/image/1/context.json",
-                      '@id': "https://ids.lib.harvard.edu/ids/iiif/5981098"
-                    },
-                    format: "image/jpeg",
-                    height: 5112,
-                    width: 4680,
-                    '@id': "https://ids.lib.harvard.edu/ids/iiif/5981098/full/full/0/native.jpg",
-                    '@type': "dctypes:Image"
+                resource: {
+                  service: {
+                    profile: "http://library.stanford.edu/iiif/image-api/1.1/conformance.html#level1",
+                    '@context': "http://iiif.io/api/image/1/context.json",
+                    '@id': "https://ids.lib.harvard.edu/ids/iiif/5981098"
                   },
-                  on: "https://iiif.lib.harvard.edu/manifests/drs:5981093/canvas/canvas-5981098.json",
-                  motivation: "sc:painting",
-                  '@id': "https://iiif.lib.harvard.edu/manifests/drs:5981093/annotation/anno-5981098.json",
-                  '@type': "oa:Annotation"
-                }
-              ],
+                  format: "image/jpeg",
+                  height: 5112,
+                  width: 4680,
+                  '@id': "https://ids.lib.harvard.edu/ids/iiif/5981098/full/full/0/native.jpg",
+                  '@type': "dctypes:Image"
+                },
+                on: "https://iiif.lib.harvard.edu/manifests/drs:5981093/canvas/canvas-5981098.json",
+                motivation: "sc:painting",
+                '@id': "https://iiif.lib.harvard.edu/manifests/drs:5981093/annotation/anno-5981098.json",
+                '@type': "oa:Annotation"
+              }
+                      ],
               height: 5112,
               '@id': "https://iiif.lib.harvard.edu/manifests/drs:5981093/canvas/canvas-5981098.json",
               thumbnail: {
                 '@id': "https://ids.lib.harvard.edu/ids/iiif/5981098/full/,150/0/native.jpg",
                 '@type': "dctypes:Image"
-}
+              }
             }, {
               '@id': "https://purl.stanford.edu/qm670kv1873/iiif/canvas/image_1",
               '@type': "sc:Canvas",
@@ -103,16 +104,19 @@ describe('Window', function() {
                 on: "https://purl.stanford.edu/qm670kv1873/iiif/canvas/image_1"
               }]
             }];
-          },
-          getAnnotationsListUrls: function() {
-            return [];
-          },
-          getStructures: function() {
-            return [];
-          },
-          getVersion: function() {
-            return '1';
-          }
+                                    },
+            getAnnotationsListUrls: function() {
+              return [];
+            },
+            getStructures: function() {
+              return [];
+            },
+            getVersion: function() {
+              return '1';
+            },
+            getViewingDirection: function() {
+              return 'right-to-left';
+            }
           },
           appendTo: this.appendTo,
           userButtons: [{
@@ -160,6 +164,7 @@ describe('Window', function() {
         expect(this.appendTo.find('.mirador-icon-text').has('i.fa.fa-lg.fa-fw.fa-file-text-o').length).toBe(1);
       });
     });
+
     describe('Menu Events', function() {
       xit('should change to book view when button is clicked', function() {
         expect(this.appendTo.find('.book-option')).toExist();
@@ -172,6 +177,13 @@ describe('Window', function() {
       });
     });
 
+    describe('r-t-l viewing', function() {
+      it('causes the imagesList ordering to be reversed and the derivative lists to be generated', function() {
+        expect(this.window.imagesListRtl[0]).toBe(this.window.imagesList[this.window.imagesList.length-1]);
+        expect(this.window.vDirectionStatus).toBe('rtl');
+      });
+    });
+
     describe('Navigation events', function() {
       it('changing the canvasID changes the focused canvasModel', function() {
         expect(this.window.canvasID).toEqual('https://iiif.lib.harvard.edu/manifests/drs:5981093/canvas/canvas-5981098.json');