Revert "Fix mistake in french locale"

ProjectMirador · Nov 7, 2016 · ad20429 · ad20429
1 parent ef67095
commit ad20429
Show file tree

Hide file tree

Showing 16 changed files with 152 additions and 344 deletions.
diff --git a/js/src/annotations/annotationTooltip.js b/js/src/annotations/annotationTooltip.js
@@ -153,19 +153,19 @@
           event: false
         },
         events: {
-          shown: function(event, api) {
+          show: function(event, api) {
             if (params.onTooltipShown) { params.onTooltipShown(event, api); }
           },
           hidden: function(event, api) {
             if (params.onTooltipHidden) { params.onTooltipHidden(event, api); }
-            _this.removeAllEvents(api, params);
           },
           visible: function (event, api) {
+            _this.removeAllEvents(api, params);
             _this.addViewerEvents(api, params);
           },
           move: function (event, api) {
-           // _this.removeAllEvents(api, params);
-           // _this.addViewerEvents(api, params);
+            _this.removeAllEvents(api, params);
+            _this.addViewerEvents(api, params);
           }
         }
       });
@@ -232,8 +232,6 @@
            _this.addEditorEvents(api, viewerParams);
         } else {
           _this.eventEmitter.publish('annotationInEditMode.' + _this.windowId,[oaAnno]);
-          api.destroy();
-          jQuery(api.tooltip).remove();
         }
 
         _this.eventEmitter.publish('SET_ANNOTATION_EDITING.' + _this.windowId, {

diff --git a/js/src/annotations/osd-region-draw-tool.js b/js/src/annotations/osd-region-draw-tool.js
@@ -76,38 +76,37 @@
       }
     },
 
-    render: function () {
-
-      if(this.parent.mode !== $.AnnotationsLayer.DISPLAY_ANNOTATIONS){
-        return ;
-      }
+    render: function() {
       this.svgOverlay.restoreEditedShapes();
       this.svgOverlay.paperScope.activate();
       this.svgOverlay.paperScope.project.clear();
       var _this = this;
       _this.annotationsToShapesMap = {};
-
-      for (var i = 0; i < this.list.length; i++) {
-        var shapeArray;
-        var annotation = this.list[i];
+      var deferreds = jQuery.map(this.list, function(annotation) {
+        var deferred = jQuery.Deferred(),
+        shapeArray;
         if (annotation.on && typeof annotation.on === 'object') {
           if (!annotation.on.selector) {
-            continue;
+            return deferred;
           } else if (annotation.on.selector.value.indexOf('<svg') !== -1) {
             shapeArray = _this.svgOverlay.parseSVG(annotation.on.selector.value, annotation);
           } else if (annotation.on.selector.value.indexOf('xywh=') !== -1) {
             shapeArray = _this.parseRectangle(annotation.on.selector.value, annotation);
           } else {
-           continue;
+            return deferred;
           }
         } else if (annotation.on && typeof annotation.on === 'string' && annotation.on.indexOf('xywh=') !== -1) {
           shapeArray = _this.parseRectangle(annotation.on, annotation);
         } else {
-          continue;
+          return deferred;
         }
         _this.svgOverlay.restoreLastView(shapeArray);
         _this.annotationsToShapesMap[annotation['@id']] = shapeArray;
-      }
+        return deferred;
+      });
+      jQuery.when.apply(jQuery, deferreds).done(function() {
+        _this.eventEmitter.publish('overlaysRendered.' + _this.windowId);
+      });
 
       var windowElement = _this.state.getWindowElement(_this.windowId);
       this.annoTooltip = new $.AnnotationTooltip({
@@ -122,7 +121,6 @@
         getAnnoFromRegion: _this.getAnnoFromRegion.bind(this)
       });
       this.svgOverlay.paperScope.view.draw();
-      _this.eventEmitter.publish('annotationsRendered.' + _this.windowId);
     },
 
     parseRectangle: function(rectString, annotation) {
@@ -263,10 +261,6 @@
         });
         _this.svgOverlay.paperScope.view.draw();
       }));
-
-      this.eventsSubscriptions.push(_this.eventEmitter.subscribe('refreshOverlay.' + _this.windowId, function (event) {
-        _this.render();
-      }));
     },
 
     getAnnoFromRegion: function(regionId) {

diff --git a/js/src/annotations/osd-svg-overlay.js b/js/src/annotations/osd-svg-overlay.js
@@ -414,13 +414,6 @@
         _this.annoTooltip = null;
         _this.annoEditorVisible = false;
       }));
-
-      this.eventsSubscriptions.push(this.eventEmitter.subscribe("ANNOTATIONS_LIST_UPDATED",function(event,options){
-        if(options.windowId) {
-          _this.eventEmitter.publish("refreshOverlay." + _this.windowId);
-        }
-      }));
-
     },
 
     deleteShape:function(shape){

diff --git a/js/src/utils/jsonLd.js b/js/src/utils/jsonLd.js
@@ -1,66 +1,20 @@
 (function($) {
-  /** Get the language to use for displaying the given propertyValue.
-   *
-   * Uses the algorithm described in
-   * http://iiif.io/api/presentation/2.1/#language-of-property-values
-   */
-  function getDisplayLanguage(languages, items) {
-    var itemLanguages = items.map(function(itm) {
-      if (typeof itm === 'string') {
-        return null;
-      } else {
-        return itm['@language'];
-      }
-    });
-
-    var bestLanguageMatch = null;
-    jQuery.each(languages, function(idx, lang) {
-      if (bestLanguageMatch !== null) {
-        return false;
-      } else {
-        if (itemLanguages.indexOf(lang) !== -1) {
-          bestLanguageMatch = lang;
-        }
-      }
-    });
-
-    // Only pick the first available language if **all** property values
-    // have an associated language
-    if (bestLanguageMatch === null && itemLanguages.indexOf(null) === -1) {
-      bestLanguageMatch = itemLanguages[0];
-    }
-    return bestLanguageMatch;
-  }
-
+
   $.JsonLd = {
     getTextValue: function(propertyValue, language) {
-      var languages = window.navigator.languages || ['en'];
-      if (typeof language === 'string') {
-        languages = [language].concat(languages);
-      } else if (Array.isArray(language)) {
-        languages = language.concat(languages);
-      }
-
-      if (typeof propertyValue === 'undefined' || propertyValue === null) {
-        return '';
-      }
-      else if (typeof propertyValue === 'string') {
-        return propertyValue;
-      }
+      if (typeof language === 'undefined') { language = "en"; }
+      if (typeof propertyValue === 'undefined' || propertyValue === null) {return ''; }
+      else if (typeof propertyValue === 'string') { return propertyValue; }
       else if (Array.isArray(propertyValue)) {
-        var displayLanguage = getDisplayLanguage(languages, propertyValue);
         var text = '';
-        jQuery.each(propertyValue, function(idx, item) {
-          var textToAdd = '';
-          if (typeof item === 'string' && displayLanguage === null) {
-            textToAdd = item;
-          } else if (item['@language'] === displayLanguage) {
-            textToAdd = item['@value'];
-          }
-          if (textToAdd !== '' && text !== '') {
-            text += '<br/>';
+        jQuery.each(propertyValue, function(index, item) {
+          if (typeof item === "string") {
+            text += item;
+            text += "<br/>";
+          } else if (!text || item['@language'] === language) {
+            // {@value: ..., @language: ...}
+              text = item['@value'];
           }
-          text += textToAdd;
         });
         return text;
       } else {

diff --git a/js/src/widgets/annotationsLayer.js b/js/src/widgets/annotationsLayer.js
@@ -17,8 +17,6 @@
     this.init();
   };
 
-  $.AnnotationsLayer.DISPLAY_ANNOTATIONS = 'displayAnnotations';
-
   $.AnnotationsLayer.prototype = {
 
     init: function() {

diff --git a/js/src/widgets/imageView.js b/js/src/widgets/imageView.js
@@ -270,7 +270,8 @@
 
       this.element.find('.mirador-osd-refresh-mode').on('click', function() {
         //update annotation list from endpoint
-        _this.eventEmitter.publish('updateAnnotationList.' + _this.windowId);
+        _this.eventEmitter.publish('updateAnnotationList.'+_this.windowId);
+       // _this.eventEmitter.publish('refreshOverlay.'+_this.windowId, '');
       });
       //Annotation specific controls
 

diff --git a/js/src/widgets/sidePanel.js b/js/src/widgets/sidePanel.js
@@ -187,11 +187,18 @@
 
     render: function(renderingData) {
       var _this = this;
+
       if (!this.element) {
         this.element = this.appendTo;
         jQuery(_this.template(renderingData)).appendTo(_this.appendTo);
         return;
       }
+
+      if (renderingData.open) {
+        this.appendTo.removeClass('minimized');
+      } else {
+        this.appendTo.addClass('minimized');
+      }
     },
 
     template: Handlebars.compile([

diff --git a/js/src/workspace.js b/js/src/workspace.js
@@ -364,7 +364,6 @@
       //delete targetSlot;
       _this.layoutDescription = root;
       _this.calculateLayout();
-      _this.eventEmitter.publish('slotRemoved',targetSlot);
     },
 
     newNode: function(type, parent) {