Merge pull request #5034 from cezaraugusto/bug/5010

Disable option to add a bookmark without location and a folder without a title.
brave · Oct 21, 2016 · b68625a · b68625a
2 parents ccf4a67 + bfaf98b
commit b68625a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/js/components/addEditBookmark.js b/js/components/addEditBookmark.js
@@ -36,8 +36,9 @@ class AddEditBookmark extends ImmutableComponent {
     const title = this.props.currentDetail.get('title') || this.props.currentDetail.get('customTitle')
     const location = this.props.currentDetail.get('location')
 
-    return (typeof title === 'string' && title.trim().length > 0) ||
-      (!this.isFolder && typeof location === 'string' && location.trim().length > 0)
+    return this.isFolder
+      ? (typeof title === 'string' && title.trim().length > 0)
+      : (typeof title === 'string' && location.trim().length > 0)
   }
 
   get isFolder () {

diff --git a/less/button.less b/less/button.less
@@ -41,8 +41,10 @@ span.browserButton,
   }
 
   &[disabled] {
-    opacity: .25;
     pointer-events: none;
+    // prevent titleMode animation from overriding opacity
+    animation: none !important;
+    opacity: .25 !important;
   }
 
   &.smallButton {