Merge pull request #833 from kossebau/fixEnabledHyperlinkToolsWithoutDoc

Fix wrongly enabled hyperlink tools without a document loaded
webodf · Sep 24, 2014 · b9044f8 · b9044f8
2 parents f98e30c + a68442d
commit b9044f8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,17 @@
+# Changes between 0.5.4 and 0.5.5
+
+## WebODF
+
+
+
+## Wodo.TextEditor
+See also section about WebODF
+
+### Fixes
+
+* Fix wrongly enabled hyperlink tools with no document loaded ([#833](https://github.com/kogmbh/WebODF/pull/833))
+
+
 # Changes between 0.5.3 and 0.5.4
 
 ## WebODF

diff --git a/programs/editor/widgets/editHyperlinks.js b/programs/editor/widgets/editHyperlinks.js
@@ -84,11 +84,11 @@ define("webodf/editor/widgets/editHyperlinks", [
 
             function updateHyperlinkButtons() {
                 var controllerEnabled = hyperlinkController && hyperlinkController.isEnabled(),
-                    linksInSelection = controllerEnabled && editorSession.getSelectedHyperlinks();
+                    linksInSelection;
 
                 // Enable to disable all widgets initially
                 widget.children.forEach(function (element) {
-                    element.set('disabled', controllerEnabled === false, false);
+                    element.set('disabled', controllerEnabled !== true, false);
                 });
                 if (controllerEnabled) {
                     // Specifically enable the remove hyperlink button only if there are links in the current selection