Merge pull request #1207 from kinow/replace-nbsp-space

Replace NBSP by spaces
NatLibFi · Sep 15, 2021 · 33a2222 · 33a2222
2 parents 4b4359d + 5911225
commit 33a2222
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/model/DataObject.php b/model/DataObject.php
@@ -50,7 +50,7 @@ protected function getExternalLabel($exvoc, $exuri, $lang)
                 $exsparql = $exvoc->getSparql();
                 $results = $exsparql->queryLabel($exuri, $lang);
                 return isset($results[$lang]) ? $results[$lang] : null;
-            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->model->getConfig()->getLogCaughtExceptions()) {
                     error_log('Caught exception: ' . $e->getMessage());
                 }
@@ -72,7 +72,7 @@ protected function getExternalNotation($exvoc, $exuri)
                 $exsparql = $exvoc->getSparql();
                 $results = $exsparql->queryNotation($exuri);
                 return isset($results) ? $results : null;
-            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->model->getConfig()->getLogCaughtExceptions()) {
                     error_log('Caught exception: ' . $e->getMessage());
                 }

diff --git a/model/Model.php b/model/Model.php
@@ -478,7 +478,7 @@ private function disambiguateVocabulary($vocabs, $uri, $preferredVocabId = null)
                             // not found in preferred vocabulary, fall back to next method
                             break;
                         }
-                    } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+                    } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                         if ($this->getConfig()->getLogCaughtExceptions()) {
                             error_log('Caught exception: ' . $e->getMessage());
                         }
@@ -494,7 +494,7 @@ private function disambiguateVocabulary($vocabs, $uri, $preferredVocabId = null)
                 if ($vocab->getConceptLabel($uri, null) !== null) {
                     return $vocab;
                 }
-            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+            } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
                 if ($this->getConfig()->getLogCaughtExceptions()) {
                     error_log('Caught exception: ' . $e->getMessage());
                 }

diff --git a/model/Vocabulary.php b/model/Vocabulary.php
@@ -162,7 +162,7 @@ public function getInfo($lang = null)
             // query everything the endpoint knows about the ConceptScheme
             $sparql = $this->getSparql();
             $result = $sparql->queryConceptScheme($defaultcs);
-        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
                  error_log('Caught exception: ' . $e->getMessage());
              }
@@ -252,7 +252,7 @@ public function getConceptSchemes($lang = '')
         $conceptSchemes = null;
         try {
             $conceptSchemes = $this->getSparql()->queryConceptSchemes($lang);
-        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
                  error_log('Caught exception: ' . $e->getMessage());
              }
@@ -452,7 +452,7 @@ public function getConceptInfo($uri, $clang)
         $conceptInfo = null;
         try {
             $conceptInfo = $sparql->queryConceptInfo($uri, $this->config->getArrayClassURI(), array($this), $clang);
-        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
+        } catch (EasyRdf\Http\Exception | EasyRdf\Exception | Throwable $e) {
              if ($this->model->getConfig()->getLogCaughtExceptions()) {
                  error_log('Caught exception: ' . $e->getMessage());
              }

diff --git a/resource/js/scripts.js b/resource/js/scripts.js
@@ -114,7 +114,7 @@ $.ajaxQ = (function(){
       var r = [];
       $.each(Q, function(i, jqXHR){
         r.push(jqXHR._id);
-        if (jqXHR.req_kind == $.ajaxQ.requestKind.CONTENT || jqXHR.req_kind == $.ajaxQ.requestKind.PLUGIN) {
+        if (jqXHR.req_kind == $.ajaxQ.requestKind.CONTENT || jqXHR.req_kind == $.ajaxQ.requestKind.PLUGIN) {
           jqXHR.abort();
         }
       });
@@ -124,7 +124,7 @@ $.ajaxQ = (function(){
       var r = [];
       $.each(Q, function(i, jqXHR){
         r.push(jqXHR._id);
-        if (jqXHR.req_kind == $.ajaxQ.requestKind.SIDEBAR || all && jqXHR.req_kind == $.ajaxQ.requestKind.SIDEBAR_PRIVILEGED) {
+        if (jqXHR.req_kind == $.ajaxQ.requestKind.SIDEBAR || all && jqXHR.req_kind == $.ajaxQ.requestKind.SIDEBAR_PRIVILEGED) {
           jqXHR.abort();
         }
       });