Merge branch 'master' into issues/254

visjs · Jan 21, 2020 · 842f25e · 842f25e
2 parents 28bab24 + 2861085
commit 842f25e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/lib/DOMutil.js b/lib/DOMutil.js
@@ -224,10 +224,15 @@ export function drawBar (x, y, width, height, className, JSONcontainer, svgConta
  * @returns {string}
  */
 export function getNavigatorLanguage() {
-  if (!navigator) return 'en';
-  if (navigator.languages && navigator.languages.length) {
-    return navigator.languages;
-  } else {
-    return navigator.userLanguage || navigator.language || navigator.browserLanguage || 'en';
+  try {
+    if (!navigator) return 'en';
+    if (navigator.languages && navigator.languages.length) {
+      return navigator.languages;
+    } else {
+      return navigator.userLanguage || navigator.language || navigator.browserLanguage || 'en';
+    }
+  } 
+  catch(error) {
+    return 'en';
   }
 }
diff --git a/lib/timeline/component/ItemSet.js b/lib/timeline/component/ItemSet.js
@@ -2288,9 +2288,7 @@ class ItemSet extends Component {
    */
   _onUpdateItem(item) {
     if (!this.options.selectable) return;
-    if (!this.options.editable.updateTime) return;
-    if (!this.options.editable.updateGroup) return;
-
+    if (!this.options.editable.updateTime && !this.options.editable.updateGroup) return;
 
     const me = this;