Changeset 6145 for SRUAggregator

Timestamp:

04/15/15 10:35:11 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. beta-36: debugging js object, misc

Location:

SRUAggregator/trunk

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (1 diff)
• src/main/resources/assets/CLARIN.css (modified) (1 diff)
• src/main/resources/assets/clarinservices/clarinservices.css (modified) (1 diff)
• src/main/resources/assets/js/main.js (modified) (3 diffs)
• src/main/resources/assets/js/main.jsx (modified) (4 diffs)
• src/main/resources/assets/js/search.js (modified) (39 diffs)
• src/main/resources/assets/js/search.jsx (modified) (41 diffs)

SRUAggregator/trunk/pom.xml

@@ -8 +8 @@
         <groupId>eu.clarin.sru.fcs</groupId>
         <artifactId>aggregator</artifactId>
-        <version>2.0.0-beta-35</version>
+        <version>2.0.0-beta-36</version>
         <name>FCS Aggregator</name>
 

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -82 +82 @@
  * TODO: test it in IE, other browsers
  *
- * TODO: tri-state for parent collections; search + message implications
+ * TODO: expand parents of x-aggregator-context selected corpus
  *
  */

SRUAggregator/trunk/src/main/resources/assets/CLARIN.css

@@ -10 +10 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  color: #222;
+  color: black;
+  /*color: #222;*/
   /*font-size: 12px;*/
   /*word-wrap: break-word;*/

SRUAggregator/trunk/src/main/resources/assets/clarinservices/clarinservices.css

@@ -1 +1 @@
 #clarinservices button.dropdown-toggle {
         background-color: transparent;
+        font-size:18px;
 }
 

SRUAggregator/trunk/src/main/resources/assets/js/main.js

@@ -3 +3 @@
 "use strict";
 
-var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-35";
+var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-36";
 
 var URLROOT = window.MyAggregator.URLROOT =
@@ -420 +420 @@
 
                                         React.createElement("h3", null, "More help"), 
-                                        React.createElement("p", null, "More detailed information on using FCS Aggregator is available at the", 
+                                        React.createElement("p", null, "More detailed information on using FCS Aggregator is available at the  ", 
                                         React.createElement("a", {href: "http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/FCS_Aggregator"}, 
                                                 "Aggregator wiki page"
@@ -571 +571 @@
 
 window.onpopstate = routeFromLocation.bind(main);
+window.MyAggregator.main = main;
 
 })();

SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

@@ -3 +3 @@
 "use strict";
 
-var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-35";
+var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-36";
 
 var URLROOT = window.MyAggregator.URLROOT =
@@ -141 +141 @@
                                 <ul id="CLARIN_header_right" className="nav navbar-nav navbar-right">
                                         <li>
-                                                <div id="clarinservices" style={{padding:10}}/>
+                                                <div id="clarinservices" style={{padding:5}}/>
                                         </li>
                                         {this.renderLogin()}
@@ -420 +420 @@
 
                                         <h3>More help</h3>
-                                        <p>More detailed information on using FCS Aggregator is available at the
+                                        <p>More detailed information on using FCS Aggregator is available at the &nbsp;
                                         <a href="http://weblicht.sfs.uni-tuebingen.de/weblichtwiki/index.php/FCS_Aggregator">
                                                 Aggregator wiki page
@@ -571 +571 @@
 
 window.onpopstate = routeFromLocation.bind(main);
+window.MyAggregator.main = main;
 
 })();

SRUAggregator/trunk/src/main/resources/assets/js/search.js

@@ -42 +42 @@
 var layerMap = {
         text: layers[0],
-        sampa: layers[1], 
+        sampa: layers[1],
 };
 
@@ -60 +60 @@
         var that = this;
         this.corpora = corpora;
-        this.update = function() { 
-                updateFn(that); 
+        this.update = function() {
+                updateFn(that);
         };
-        
+
         var sortFn = function(x, y) {
                 var r = x.institution.name.localeCompare(y.institution.name);
@@ -69 +69 @@
                         return r;
                 }
-                return x.title.toLowerCase().localeCompare(y.title.toLowerCase()); 
+                return x.title.toLowerCase().localeCompare(y.title.toLowerCase());
         };
 
@@ -79 +79 @@
                 corpus.selected = true; // selected in the corpus view
                 corpus.expanded = false; // not expanded in the corpus view
-                corpus.priority = 1; // used for ordering search results in corpus view 
+                corpus.priority = 1; // used for ordering search results in corpus view
                 corpus.index = index; // original order, used for stable sort
         });
@@ -85 +85 @@
 
 Corpora.prototype.recurseCorpus = function(corpus, fn) {
-        if (false === fn(corpus)) {             
+        if (false === fn(corpus)) {
                 // no recursion
         } else {
@@ -129 +129 @@
         if (corpus.languages && corpus.languages.length === 1 && corpus.languages[0] === languageCode) {
                 return true;
-        }       
+        }
 
         // ? yes if the corpus also contains that language
@@ -152 +152 @@
 
 Corpora.prototype.setAggregationContext = function(endpoints2handles) {
-        // console.log('setAggregationContext', endpoints2handles, this.corpora);
-        var recurseSelect = function(select, corpus) {
+        var selectSubTree = function(select, corpus) {
                 corpus.selected = false;
                 this.recurseCorpora(corpus.subCorpora, function(c) { c.selected = corpus.selected; });
         };
 
-        this.corpora.forEach(recurseSelect.bind(this, false));
+        this.corpora.forEach(selectSubTree.bind(this, false));
 
         var corporaToSelect = [];
@@ -173 +172 @@
         }.bind(this));
 
-        corporaToSelect.forEach(recurseSelect.bind(this, true));
+        corporaToSelect.forEach(selectSubTree.bind(this, true));
 };
 
@@ -217 +216 @@
         },
 
-        nohits: { 
+        nohits: {
                 results: null,
         },
@@ -247 +246 @@
                                 if (this.isMounted()) {
                                         var corpora = new Corpora(json.corpora, this.updateCorpora);
+                                        window.MyAggregator.corpora = json.corpora;
                                         this.setState({
                                                 corpora : corpora,
@@ -255 +255 @@
 
                                         if (json['x-aggregation-context']) {
-                                                console.log("x-aggregation-context: ", json["x-aggregation-context"]);
+                                                window.MyAggregator.xAggregationContext = json["x-aggregation-context"];
                                                 corpora.setAggregationContext(json["x-aggregation-context"]);
                                                 if (!corpora.getSelectedIds().length) {
@@ -266 +266 @@
                                         if (getQueryVariable('mode') === 'search' ||
                                                 json.mode === 'search') {
+                                                        window.MyAggregator.mode = 'search';
                                                         this.search();
                                         }
@@ -281 +282 @@
                 if (!query || this.props.embedded) {
                         this.setState({ hits: this.nohits, searchId: null });
-                        return;                 
+                        return;
                 }
                 var selectedIds = this.state.corpora.getSelectedIds();
@@ -370 +371 @@
 
         getDownloadLink: function(corpusId, format) {
-                return 'rest/search/'+this.state.searchId+'/download?' + 
+                return 'rest/search/'+this.state.searchId+'/download?' +
                         this.getExportParams(corpusId, format);
         },
 
         getToWeblichtLink: function(corpusId, forceLanguage) {
-                return 'rest/search/'+this.state.searchId+'/toWeblicht?' + 
+                return 'rest/search/'+this.state.searchId+'/toWeblicht?' +
                         this.getExportParams(corpusId, null, forceLanguage);
         },
 
         setLanguageAndFilter: function(languageObj, languageFilter) {
-                this.state.corpora.setVisibility(this.state.searchLayerId, 
+                this.state.corpora.setVisibility(this.state.searchLayerId,
                         languageFilter === 'byGuess' ? multipleLanguageCode : languageObj[0]);
                 this.setState({
-                        language: languageObj, 
-                        languageFilter: languageFilter, 
+                        language: languageObj,
+                        languageFilter: languageFilter,
                         corpora: this.state.corpora, // === this.state.corpora.update();
                 });
@@ -392 +393 @@
                 this.state.corpora.setVisibility(layerId, this.state.language[0]);
                 this.setState({
-                        searchLayerId: layerId, 
-                        hits: this.nohits, 
+                        searchLayerId: layerId,
+                        hits: this.nohits,
                         searchId: null,
                         corpora: this.state.corpora, // === this.state.corpora.update();
@@ -417 +418 @@
                 var results = null, inProgress = 0, hits = 0;
                 if (this.state.hits.results) {
-                        results = this.state.hits.results.map(function(corpusHit) { 
+                        results = this.state.hits.results.map(function(corpusHit) {
                                 return {
                                         corpus: corpusHit.corpus,
@@ -425 +426 @@
                                         kwics: noLangFiltering ? corpusHit.kwics :
                                                 corpusHit.kwics.filter(function(kwic) {
-                                                        return kwic.language === langCode || 
-                                                               langCode === multipleLanguageCode || 
-                                                               langCode === null; 
+                                                        return kwic.language === langCode ||
+                                                               langCode === multipleLanguageCode ||
+                                                               langCode === null;
                                                 }),
                                 };
@@ -482 +483 @@
                 return React.createElement("h3", {style: {fontSize:'1em'}}, 
                                         corpus.title, 
-                                         corpus.landingPage ? 
+                                         corpus.landingPage ?
                                                 React.createElement("a", {href: corpus.landingPage, onClick: this.stop, style: {fontSize:12}}, 
                                                         React.createElement("span", null, " – Homepage "), 
@@ -504 +505 @@
                         React.createElement("button", {className: "btn btn-default input-lg", type: "button", onClick: this.search}, 
                                 React.createElement("i", {className: "glyphicon glyphicon-search"})
-                        ) 
+                        )
                 );
         },
@@ -534 +535 @@
 
                                                         React.createElement("div", {className: "input-group"}, 
-                                                                
+
                                                                 React.createElement("span", {className: "input-group-addon nobkg"}, "Search for"), 
-                                                                
+
                                                                 React.createElement("div", {className: "input-group-btn"}, 
                                                                         React.createElement("button", {className: "form-control btn btn-default", 
@@ -547 +548 @@
                                                                 React.createElement("div", {className: "input-group-btn"}, 
                                                                         React.createElement("ul", {ref: "layerDropdownMenu", className: "dropdown-menu"}, 
-                                                                                        layers.map(function(l) { 
+                                                                                        layers.map(function(l) {
                                                                                                 var cls = l.disabled ? 'disabled':'';
                                                                                                 var handler = function() { if (!l.disabled) this.setLayer(l.id); }.bind(this);
@@ -554 +555 @@
                                                                                         }.bind(this))
                                                                                 
-                                                                        ),                                                              
+                                                                        ), 
                                                                         React.createElement("button", {className: "form-control btn btn-default", 
                                                                                         'aria-expanded': "false", 'data-toggle': "dropdown"}, 
@@ -563 +564 @@
                                                         ), 
 
-                                                         this.props.embedded ? false : 
+                                                         this.props.embedded ? false :
                                                         React.createElement("div", {className: "input-group"}, 
                                                                 React.createElement("span", {className: "input-group-addon nobkg"}, "in"), 
@@ -571 +572 @@
                                                         ), 
 
-                                                         this.props.embedded ? false : 
+                                                         this.props.embedded ? false :
                                                         React.createElement("div", {className: "input-group"}, 
                                                                 React.createElement("span", {className: "input-group-addon nobkg"}, "and show up to"), 
@@ -654 +655 @@
 
         renderRadio: function(option) {
-                return  this.props.languageFilter === option ? 
+                return  this.props.languageFilter === option ?
                                 React.createElement("input", {type: "radio", name: "filterOpts", value: option, checked: true, onChange: this.setFilter.bind(this, option)})
                                 : React.createElement("input", {type: "radio", name: "filterOpts", value: option, onChange: this.setFilter.bind(this, option)});
@@ -681 +682 @@
                                                         React.createElement("label", {style: {color:'black'}}, 
                                                                  this.renderRadio('byMeta'), " ", 
-                                                                "Use the collections", "'", " specified language to filter results" 
+                                                                "Use the collections", "'", " specified language to filter results"
                                                         )
                                                         ), 
@@ -687 +688 @@
                                                         React.createElement("label", {style: {color:'black'}}, 
                                                                  this.renderRadio('byGuess'), " ", 
-                                                                "Filter results by using a language detector" 
+                                                                "Filter results by using a language detector"
                                                         )
                                                         ), 
@@ -708 +709 @@
         //      return {hasPopover: true};
         // },
- 
+
         getInitialState: function () {
-                return { 
+                return {
                         displayKwic: false,
                 };
@@ -758 +759 @@
                 return  React.createElement("div", {className: "alert alert-warning", key: key}, 
                                         React.createElement("div", null, "Diagnostic: ", d.message)
-                                ); 
+                                );
         },
 
@@ -803 +804 @@
                 return  React.createElement("div", {className: "inline btn-group", style: {display:"inline-block"}}, 
                                         React.createElement("label", {forHtml: "inputKwic", className: "btn btn-flat"}, 
-                                                 this.state.displayKwic ? 
+                                                 this.state.displayKwic ?
                                                         React.createElement("input", {id: "inputKwic", type: "checkbox", value: "kwic", checked: true, onChange: this.toggleKwic}) :
                                                         React.createElement("input", {id: "inputKwic", type: "checkbox", value: "kwic", onChange: this.toggleKwic}), 
@@ -845 +846 @@
                                 React.createElement("ul", {className: "dropdown-menu"}, 
                                         React.createElement("li", null, 
-                                                error ? 
+                                                error ?
                                                         React.createElement("div", {className: "alert alert-danger", style: {margin:10, width:200}}, error) :
                                                         React.createElement("a", {href: this.props.getToWeblichtLink(corpusId, forceLanguage), target: "_blank"}, " ", 
@@ -893 +894 @@
 
         renderMoreResults:function(){
-                if (this.state.inProgress || this.props.corpusHit.inProgress) 
+                if (this.state.inProgress || this.props.corpusHit.inProgress)
                         return React.createElement("span", {style: {fontStyle:'italic'}}, "Retrieving results, please wait...");
 
@@ -919 +920 @@
                 var forceLanguage = null, wlerror = null;
                 if (this.props.weblichtLanguages.indexOf(this.props.searchedLanguage[0]) < 0) {
-                        // the search language is either AnyLanguage or unsupported 
+                        // the search language is either AnyLanguage or unsupported
                         if (this.props.searchedLanguage[0] === multipleLanguageCode) {
                                 if (corpusHit.corpus.languages && corpusHit.corpus.languages.length === 1) {
@@ -930 +931 @@
                                         }
                                 }
-                        } 
+                        }
                         if (!forceLanguage) {
                                 wlerror = "Cannot use WebLicht: unsupported language ("+this.props.searchedLanguage[1]+")";
@@ -940 +941 @@
                                                 React.createElement("div", {className: "corpusDescription"}, 
                                                         React.createElement("p", null, React.createElement("i", {className: "fa fa-institution"}), " ", corpus.institution.name), 
-                                                        corpus.description ? 
+                                                        corpus.description ?
                                                                 React.createElement("p", null, React.createElement("i", {className: "glyphicon glyphicon-info-sign"}), " ", corpus.description): false, 
                                                         React.createElement("p", null, React.createElement("i", {className: "fa fa-language"}), " ", this.renderLanguages(corpus.languages))
@@ -992 +993 @@
 
         renderResultPanel: function(corpusHit) {
-                if (corpusHit.kwics.length === 0 && 
+                if (corpusHit.kwics.length === 0 &&
                         !corpusHit.exception &&
                         corpusHit.diagnostics.length === 0) {
@@ -1012 +1013 @@
                 return  React.createElement("div", {style: {marginTop:10}}, 
                                         React.createElement("div", null, msg), 
-                                        collhits.inProgress > 0 ? 
+                                        collhits.inProgress > 0 ?
                                                 React.createElement("div", {className: "progress", style: {marginBottom:10}}, 
                                                         React.createElement("div", {className: "progress-bar progress-bar-striped active", role: "progressbar", 
@@ -1021 +1022 @@
                                                                         style: {width: '100%', backgroundColor:'#888'}})
                                                         
-                                                ) : 
+                                                ) :
                                                 false
                                 );
@@ -1036 +1037 @@
                                                  showprogress ? this.renderProgressMessage() : React.createElement("div", {style: {height:20}}), 
                                                 React.createElement("div", {style: {marginBottom:2}}, 
-                                                         showprogress ? false : 
+                                                         showprogress ? false :
                                                                 React.createElement("div", {className: "float-left"}, " ", collhits.hits + " matching collections found", " "), 
                                                         
-                                                         collhits.hits === 0 ? false : 
+                                                         collhits.hits === 0 ? false :
                                                                 React.createElement("div", {className: "float-right"}, 
                                                                         React.createElement("div", null, 
                                                                                  this.renderDisplayKWIC(), 
-                                                                                 collhits.inProgress === 0 ? 
+                                                                                 collhits.inProgress === 0 ?
                                                                                         React.createElement("div", {className: "inline"}, " ", this.renderDownloadLinks(), " ")
                                                                                         :false

SRUAggregator/trunk/src/main/resources/assets/js/search.jsx

@@ -42 +42 @@
 var layerMap = {
         text: layers[0],
-        sampa: layers[1], 
+        sampa: layers[1],
 };
 
@@ -60 +60 @@
         var that = this;
         this.corpora = corpora;
-        this.update = function() { 
-                updateFn(that); 
+        this.update = function() {
+                updateFn(that);
         };
-        
+
         var sortFn = function(x, y) {
                 var r = x.institution.name.localeCompare(y.institution.name);
@@ -69 +69 @@
                         return r;
                 }
-                return x.title.toLowerCase().localeCompare(y.title.toLowerCase()); 
+                return x.title.toLowerCase().localeCompare(y.title.toLowerCase());
         };
 
@@ -79 +79 @@
                 corpus.selected = true; // selected in the corpus view
                 corpus.expanded = false; // not expanded in the corpus view
-                corpus.priority = 1; // used for ordering search results in corpus view 
+                corpus.priority = 1; // used for ordering search results in corpus view
                 corpus.index = index; // original order, used for stable sort
         });
@@ -85 +85 @@
 
 Corpora.prototype.recurseCorpus = function(corpus, fn) {
-        if (false === fn(corpus)) {             
+        if (false === fn(corpus)) {
                 // no recursion
         } else {
@@ -129 +129 @@
         if (corpus.languages && corpus.languages.length === 1 && corpus.languages[0] === languageCode) {
                 return true;
-        }       
+        }
 
         // ? yes if the corpus also contains that language
@@ -152 +152 @@
 
 Corpora.prototype.setAggregationContext = function(endpoints2handles) {
-        // console.log('setAggregationContext', endpoints2handles, this.corpora);
-        var recurseSelect = function(select, corpus) {
+        var selectSubTree = function(select, corpus) {
                 corpus.selected = false;
                 this.recurseCorpora(corpus.subCorpora, function(c) { c.selected = corpus.selected; });
         };
 
-        this.corpora.forEach(recurseSelect.bind(this, false));
+        this.corpora.forEach(selectSubTree.bind(this, false));
 
         var corporaToSelect = [];
@@ -173 +172 @@
         }.bind(this));
 
-        corporaToSelect.forEach(recurseSelect.bind(this, true));
+        corporaToSelect.forEach(selectSubTree.bind(this, true));
 };
 
@@ -217 +216 @@
         },
 
-        nohits: { 
+        nohits: {
                 results: null,
         },
@@ -247 +246 @@
                                 if (this.isMounted()) {
                                         var corpora = new Corpora(json.corpora, this.updateCorpora);
+                                        window.MyAggregator.corpora = json.corpora;
                                         this.setState({
                                                 corpora : corpora,
@@ -255 +255 @@
 
                                         if (json['x-aggregation-context']) {
-                                                console.log("x-aggregation-context: ", json["x-aggregation-context"]);
+                                                window.MyAggregator.xAggregationContext = json["x-aggregation-context"];
                                                 corpora.setAggregationContext(json["x-aggregation-context"]);
                                                 if (!corpora.getSelectedIds().length) {
@@ -266 +266 @@
                                         if (getQueryVariable('mode') === 'search' ||
                                                 json.mode === 'search') {
+                                                        window.MyAggregator.mode = 'search';
                                                         this.search();
                                         }
@@ -281 +282 @@
                 if (!query || this.props.embedded) {
                         this.setState({ hits: this.nohits, searchId: null });
-                        return;                 
+                        return;
                 }
                 var selectedIds = this.state.corpora.getSelectedIds();
@@ -370 +371 @@
 
         getDownloadLink: function(corpusId, format) {
-                return 'rest/search/'+this.state.searchId+'/download?' + 
+                return 'rest/search/'+this.state.searchId+'/download?' +
                         this.getExportParams(corpusId, format);
         },
 
         getToWeblichtLink: function(corpusId, forceLanguage) {
-                return 'rest/search/'+this.state.searchId+'/toWeblicht?' + 
+                return 'rest/search/'+this.state.searchId+'/toWeblicht?' +
                         this.getExportParams(corpusId, null, forceLanguage);
         },
 
         setLanguageAndFilter: function(languageObj, languageFilter) {
-                this.state.corpora.setVisibility(this.state.searchLayerId, 
+                this.state.corpora.setVisibility(this.state.searchLayerId,
                         languageFilter === 'byGuess' ? multipleLanguageCode : languageObj[0]);
                 this.setState({
-                        language: languageObj, 
-                        languageFilter: languageFilter, 
+                        language: languageObj,
+                        languageFilter: languageFilter,
                         corpora: this.state.corpora, // === this.state.corpora.update();
                 });
@@ -392 +393 @@
                 this.state.corpora.setVisibility(layerId, this.state.language[0]);
                 this.setState({
-                        searchLayerId: layerId, 
-                        hits: this.nohits, 
+                        searchLayerId: layerId,
+                        hits: this.nohits,
                         searchId: null,
                         corpora: this.state.corpora, // === this.state.corpora.update();
@@ -417 +418 @@
                 var results = null, inProgress = 0, hits = 0;
                 if (this.state.hits.results) {
-                        results = this.state.hits.results.map(function(corpusHit) { 
+                        results = this.state.hits.results.map(function(corpusHit) {
                                 return {
                                         corpus: corpusHit.corpus,
@@ -425 +426 @@
                                         kwics: noLangFiltering ? corpusHit.kwics :
                                                 corpusHit.kwics.filter(function(kwic) {
-                                                        return kwic.language === langCode || 
-                                                               langCode === multipleLanguageCode || 
-                                                               langCode === null; 
+                                                        return kwic.language === langCode ||
+                                                               langCode === multipleLanguageCode ||
+                                                               langCode === null;
                                                 }),
                                 };
@@ -480 +481 @@
                 if (!corpusHit) return <span/>;
                 var corpus = corpusHit.corpus;
-                return <h3 style={{fontSize:'1em'}}> 
+                return <h3 style={{fontSize:'1em'}}>
                                         {corpus.title}
-                                        { corpus.landingPage ? 
+                                        { corpus.landingPage ?
                                                 <a href={corpus.landingPage} onClick={this.stop} style={{fontSize:12}}>
                                                         <span> – Homepage </span>
@@ -504 +505 @@
                         <button className="btn btn-default input-lg" type="button" onClick={this.search}>
                                 <i className="glyphicon glyphicon-search"></i>
-                        </button> 
+                        </button>
                 );
         },
@@ -513 +514 @@
                         <div className="top-gap">
                                 <div className="row">
-                                        <div className="aligncenter" style={{marginLeft:16, marginRight:16}}> 
+                                        <div className="aligncenter" style={{marginLeft:16, marginRight:16}}>
                                                 <div className="input-group">
                                                         <span className="input-group-addon" style={{backgroundColor:layer.searchLabelBkColor}}>
@@ -534 +535 @@
 
                                                         <div className="input-group">
-                                                                
+
                                                                 <span className="input-group-addon nobkg" >Search for</span>
-                                                                
+
                                                                 <div className="input-group-btn">
-                                                                        <button className="form-control btn btn-default" 
+                                                                        <button className="form-control btn btn-default"
                                                                                         onClick={this.toggleLanguageSelection}>
                                                                                 {this.state.language[1]} <span className="caret"/>
@@ -547 +548 @@
                                                                 <div className="input-group-btn">
                                                                         <ul ref="layerDropdownMenu" className="dropdown-menu">
-                                                                                {       layers.map(function(l) { 
+                                                                                {       layers.map(function(l) {
                                                                                                 var cls = l.disabled ? 'disabled':'';
                                                                                                 var handler = function() { if (!l.disabled) this.setLayer(l.id); }.bind(this);
-                                                                                                return <li key={l.id} className={cls}> <a tabIndex="-1" href="#" 
+                                                                                                return <li key={l.id} className={cls}> <a tabIndex="-1" href="#"
                                                                                                         onClick={handler}> {l.name} </a></li>;
                                                                                         }.bind(this))
                                                                                 }
-                                                                        </ul>                                                           
-                                                                        <button className="form-control btn btn-default" 
+                                                                        </ul>
+                                                                        <button className="form-control btn btn-default"
                                                                                         aria-expanded="false" data-toggle="dropdown" >
                                                                                 {layer.name} <span className="caret"/>
@@ -563 +564 @@
                                                         </div>
 
-                                                        { this.props.embedded ? false : 
+                                                        { this.props.embedded ? false :
                                                         <div className="input-group">
                                                                 <span className="input-group-addon nobkg">in</span>
@@ -571 +572 @@
                                                         </div> }
 
-                                                        { this.props.embedded ? false : 
+                                                        { this.props.embedded ? false :
                                                         <div className="input-group">
                                                                 <span className="input-group-addon nobkg">and show up to</span>
@@ -577 +578 @@
                                                                         <input type="number" className="form-control input" min="10" max="250"
                                                                                 style={{width:60}}
-                                                                                onChange={this.setNumberOfResults} value={this.state.numberOfResults} 
+                                                                                onChange={this.setNumberOfResults} value={this.state.numberOfResults}
                                                                                 onKeyPress={this.stop}/>
                                                                 </div>
@@ -609 +610 @@
 
                                 <div className="top-gap">
-                                        <Results collhits={this.filterResults()} 
+                                        <Results collhits={this.filterResults()}
                                                          toggleResultModal={this.toggleResultModal}
                                                          getDownloadLink={this.getDownloadLink}
@@ -654 +655 @@
 
         renderRadio: function(option) {
-                return  this.props.languageFilter === option ? 
+                return  this.props.languageFilter === option ?
                                 <input type="radio" name="filterOpts" value={option} checked onChange={this.setFilter.bind(this, option)}/>
                                 : <input type="radio" name="filterOpts" value={option} onChange={this.setFilter.bind(this, option)} />;
@@ -681 +682 @@
                                                         <label style={{color:'black'}}>
                                                                 { this.renderRadio('byMeta') }{" "}
-                                                                Use the collections{"'"} specified language to filter results 
+                                                                Use the collections{"'"} specified language to filter results
                                                         </label>
                                                         </div>
@@ -687 +688 @@
                                                         <label style={{color:'black'}}>
                                                                 { this.renderRadio('byGuess') }{" "}
-                                                                Filter results by using a language detector 
+                                                                Filter results by using a language detector
                                                         </label>
                                                         </div>
@@ -708 +709 @@
         //      return {hasPopover: true};
         // },
- 
+
         getInitialState: function () {
-                return { 
+                return {
                         displayKwic: false,
                 };
@@ -756 +757 @@
                         return false;
                 }
-                return  <div className="alert alert-warning" key={key}> 
+                return  <div className="alert alert-warning" key={key}>
                                         <div>Diagnostic: {d.message}</div>
-                                </div>; 
+                                </div>;
         },
 
@@ -803 +804 @@
                 return  <div className="inline btn-group" style={{display:"inline-block"}}>
                                         <label forHtml="inputKwic" className="btn btn-flat">
-                                                { this.state.displayKwic ? 
+                                                { this.state.displayKwic ?
                                                         <input id="inputKwic" type="checkbox" value="kwic" checked onChange={this.toggleKwic} /> :
                                                         <input id="inputKwic" type="checkbox" value="kwic" onChange={this.toggleKwic} />
@@ -818 +819 @@
                                 <button className="btn btn-flat" aria-expanded="false" data-toggle="dropdown">
                                         <span className="glyphicon glyphicon-download-alt" aria-hidden="true"/>
-                                        {" "} Download {" "} 
+                                        {" "} Download {" "}
                                         <span className="caret"/>
                                 </button>
@@ -840 +841 @@
                                 <button className="btn btn-flat" aria-expanded="false" data-toggle="dropdown">
                                         <span className="glyphicon glyphicon-export" aria-hidden="true"/>
-                                        {" "} Use Weblicht {" "} 
+                                        {" "} Use Weblicht {" "}
                                         <span className="caret"/>
                                 </button>
                                 <ul className="dropdown-menu">
-                                        <li> 
-                                                {error ? 
+                                        <li>
+                                                {error ?
                                                         <div className="alert alert-danger" style={{margin:10, width:200}}>{error}</div> :
-                                                        <a href={this.props.getToWeblichtLink(corpusId, forceLanguage)} target="_blank">{" "} 
+                                                        <a href={this.props.getToWeblichtLink(corpusId, forceLanguage)} target="_blank">{" "}
                                                                 Send to Weblicht</a>
                                                 }
@@ -893 +894 @@
 
         renderMoreResults:function(){
-                if (this.state.inProgress || this.props.corpusHit.inProgress) 
+                if (this.state.inProgress || this.props.corpusHit.inProgress)
                         return <span style={{fontStyle:'italic'}}>Retrieving results, please wait...</span>;
 
@@ -919 +920 @@
                 var forceLanguage = null, wlerror = null;
                 if (this.props.weblichtLanguages.indexOf(this.props.searchedLanguage[0]) < 0) {
-                        // the search language is either AnyLanguage or unsupported 
+                        // the search language is either AnyLanguage or unsupported
                         if (this.props.searchedLanguage[0] === multipleLanguageCode) {
                                 if (corpusHit.corpus.languages && corpusHit.corpus.languages.length === 1) {
@@ -930 +931 @@
                                         }
                                 }
-                        } 
+                        }
                         if (!forceLanguage) {
                                 wlerror = "Cannot use WebLicht: unsupported language ("+this.props.searchedLanguage[1]+")";
@@ -936 +937 @@
                 }
                 var corpus = corpusHit.corpus;
-                return  <div> 
+                return  <div>
                                         <ReactCSSTransitionGroup transitionName="fade">
                                                 <div className='corpusDescription'>
                                                         <p><i className="fa fa-institution"/> {corpus.institution.name}</p>
-                                                        {corpus.description ? 
+                                                        {corpus.description ?
                                                                 <p><i className="glyphicon glyphicon-info-sign"/> {corpus.description}</p>: false}
                                                         <p><i className="fa fa-language"/> {this.renderLanguages(corpus.languages)}</p>
@@ -992 +993 @@
 
         renderResultPanel: function(corpusHit) {
-                if (corpusHit.kwics.length === 0 && 
+                if (corpusHit.kwics.length === 0 &&
                         !corpusHit.exception &&
                         corpusHit.diagnostics.length === 0) {
                                 return false;
                 }
-                return  <Panel key={corpusHit.corpus.id} 
-                                                title={this.renderPanelTitle(corpusHit.corpus)} 
+                return  <Panel key={corpusHit.corpus.id}
+                                                title={this.renderPanelTitle(corpusHit.corpus)}
                                                 info={this.renderPanelInfo(corpusHit)}>
                                         {this.renderPanelBody(corpusHit)}
@@ -1012 +1013 @@
                 return  <div style={{marginTop:10}}>
                                         <div>{msg}</div>
-                                        {collhits.inProgress > 0 ? 
+                                        {collhits.inProgress > 0 ?
                                                 <div className="progress" style={{marginBottom:10}}>
-                                                        <div className="progress-bar progress-bar-striped active" role="progressbar" 
+                                                        <div className="progress-bar progress-bar-striped active" role="progressbar"
                                                                 aria-valuenow={percents} aria-valuemin="0" aria-valuemax="100" style={styleperc} />
                                                         {percents > 2 ? false :
-                                                                <div className="progress-bar progress-bar-striped active" role="progressbar" 
+                                                                <div className="progress-bar progress-bar-striped active" role="progressbar"
                                                                         aria-valuenow='100' aria-valuemin="0" aria-valuemax="100"
                                                                         style={{width: '100%', backgroundColor:'#888'}} />
                                                         }
-                                                </div> : 
+                                                </div> :
                                                 false}
                                 </div>;
@@ -1032 +1033 @@
                 }
                 var showprogress = collhits.inProgress > 0;
-                return  <div> 
+                return  <div>
                                         <ReactCSSTransitionGroup transitionName="fade">
                                                 { showprogress ? this.renderProgressMessage() : <div style={{height:20}} />}
                                                 <div style={{marginBottom:2}}>
-                                                        { showprogress ? false : 
+                                                        { showprogress ? false :
                                                                 <div className="float-left"> {collhits.hits + " matching collections found"} </div>
                                                         }
-                                                        { collhits.hits === 0 ? false : 
+                                                        { collhits.hits === 0 ? false :
                                                                 <div className="float-right">
                                                                         <div>
                                                                                 { this.renderDisplayKWIC() }
-                                                                                { collhits.inProgress === 0 ? 
+                                                                                { collhits.inProgress === 0 ?
                                                                                         <div className="inline"> {this.renderDownloadLinks()} </div>
                                                                                         :false