@@ -91,8 +100,17 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$attrEditName = this.$widget.find('.attr-edit-name');
this.$attrEditValue = this.$widget.find('.attr-edit-value');
this.$attrEditInheritable = this.$widget.find('.attr-edit-inheritable');
+ this.$closeAttrDetailButton = this.$widget.find('.close-attr-detail-button');
- return this.$widget;
+ this.$closeAttrDetailButton.on('click', () => this.hide());
+
+ $(window).on('mouseup', e => {
+ console.log("click", e.target);
+
+ if (!$(e.target).closest(this.$widget[0]).length) {
+ this.hide();
+ }
+ });
}
async showAttributeDetail(attr, x, y) {
@@ -140,7 +158,7 @@ export default class AttributeDetailWidget extends BasicWidget {
this.$relatedNotesMoreNotes.hide();
}
- this.$attrEditName.val(attr.name);
+ this.$attrEditName.val(attr.name).focus();
this.$attrEditValue.val(attr.value);
this.$widget.css("left", x - this.$widget.width() / 2);
diff --git a/src/public/app/widgets/collapsible_widget.js b/src/public/app/widgets/collapsible_widget.js
index 62e1905a9..c74ff143f 100644
--- a/src/public/app/widgets/collapsible_widget.js
+++ b/src/public/app/widgets/collapsible_widget.js
@@ -70,8 +70,6 @@ export default class CollapsibleWidget extends TabAwareWidget {
this.initialized = this.doRenderBody();
this.decorateWidget();
-
- return this.$widget;
}
saveCollapsed(collapse) {
@@ -99,4 +97,4 @@ export default class CollapsibleWidget extends TabAwareWidget {
isExpanded() {
return this.$bodyWrapper.hasClass("show");
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/flex_container.js b/src/public/app/widgets/flex_container.js
index 311071201..d2e90842d 100644
--- a/src/public/app/widgets/flex_container.js
+++ b/src/public/app/widgets/flex_container.js
@@ -40,7 +40,5 @@ export default class FlexContainer extends BasicWidget {
for (const widget of this.children) {
this.$widget.append(widget.render());
}
-
- return this.$widget;
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/global_menu.js b/src/public/app/widgets/global_menu.js
index 509bac94e..bc4ea2056 100644
--- a/src/public/app/widgets/global_menu.js
+++ b/src/public/app/widgets/global_menu.js
@@ -113,7 +113,5 @@ export default class GlobalMenuWidget extends BasicWidget {
this.$widget.find(".logout-button").toggle(!utils.isElectron());
this.$widget.find(".open-dev-tools-button").toggle(utils.isElectron());
-
- return this.$widget;
}
}
diff --git a/src/public/app/widgets/history_navigation.js b/src/public/app/widgets/history_navigation.js
index b8dc0e9d6..a6ab87792 100644
--- a/src/public/app/widgets/history_navigation.js
+++ b/src/public/app/widgets/history_navigation.js
@@ -51,8 +51,6 @@ export default class HistoryNavigationWidget extends BasicWidget {
else {
this.$widget = $("");
}
-
- return this.$widget;
}
async showContextMenu(e) {
@@ -101,4 +99,4 @@ export default class HistoryNavigationWidget extends BasicWidget {
activeNoteChangedEvent() {
this.refresh();
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/mobile_widgets/close_detail_button.js b/src/public/app/widgets/mobile_widgets/close_detail_button.js
index 8d3bbe00e..038a606b2 100644
--- a/src/public/app/widgets/mobile_widgets/close_detail_button.js
+++ b/src/public/app/widgets/mobile_widgets/close_detail_button.js
@@ -10,9 +10,7 @@ class CloseDetailButtonWidget extends BasicWidget {
this.$widget = $(TPL);
this.$widget.on('click', () => this.triggerCommand('setActiveScreen', {screen:'tree'}));
-
- return this.$widget;
}
}
-export default CloseDetailButtonWidget;
\ No newline at end of file
+export default CloseDetailButtonWidget;
diff --git a/src/public/app/widgets/mobile_widgets/mobile_detail_menu.js b/src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
index 82d8d51fb..6eacc4330 100644
--- a/src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
+++ b/src/public/app/widgets/mobile_widgets/mobile_detail_menu.js
@@ -38,9 +38,7 @@ class MobileDetailMenuWidget extends BasicWidget {
}
});
});
-
- return this.$widget;
}
}
-export default MobileDetailMenuWidget;
\ No newline at end of file
+export default MobileDetailMenuWidget;
diff --git a/src/public/app/widgets/note_actions.js b/src/public/app/widgets/note_actions.js
index 0bf2a9cdb..f53f24a00 100644
--- a/src/public/app/widgets/note_actions.js
+++ b/src/public/app/widgets/note_actions.js
@@ -113,8 +113,6 @@ export default class NoteActionsWidget extends TabAwareWidget {
this.$unprotectButton = this.$widget.find(".unprotect-button");
this.$unprotectButton.on('click', () => protectedSessionService.protectNote(this.noteId, false, false));
-
- return this.$widget;
}
refreshWithNote(note) {
@@ -140,4 +138,4 @@ export default class NoteActionsWidget extends TabAwareWidget {
this.refresh();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/note_attributes.js b/src/public/app/widgets/note_attributes.js
index 34cc83b92..81bff329b 100644
--- a/src/public/app/widgets/note_attributes.js
+++ b/src/public/app/widgets/note_attributes.js
@@ -234,12 +234,6 @@ export default class NoteAttributesWidget extends TabAwareWidget {
this.attributeDetailWidget.hide();
});
- this.$editor.on('blur', () => {
- this.save();
-
- this.attributeDetailWidget.hide();
- });
-
this.$widget.append(this.attributeDetailWidget.render());
}
diff --git a/src/public/app/widgets/note_detail.js b/src/public/app/widgets/note_detail.js
index d7ebe0ebd..82cb6cca2 100644
--- a/src/public/app/widgets/note_detail.js
+++ b/src/public/app/widgets/note_detail.js
@@ -100,8 +100,6 @@ export default class NoteDetailWidget extends TabAwareWidget {
replaceUnderscoresWithSpaces: true
});
});
-
- return this.$widget;
}
async refresh() {
diff --git a/src/public/app/widgets/note_paths.js b/src/public/app/widgets/note_paths.js
index 0a44b5de1..5c480efc8 100644
--- a/src/public/app/widgets/note_paths.js
+++ b/src/public/app/widgets/note_paths.js
@@ -57,8 +57,6 @@ export default class NotePathsWidget extends TabAwareWidget {
this.$notePathList = this.$dropdown.find(".note-path-list");
this.$dropdown.on('show.bs.dropdown', () => this.renderDropdown());
-
- return this.$widget;
}
async refreshWithNote(note, notePath) {
diff --git a/src/public/app/widgets/note_title.js b/src/public/app/widgets/note_title.js
index ae5ac4202..145417dde 100644
--- a/src/public/app/widgets/note_title.js
+++ b/src/public/app/widgets/note_title.js
@@ -48,8 +48,6 @@ export default class NoteTitleWidget extends TabAwareWidget {
utils.bindElShortcut(this.$noteTitle, 'return', () => {
this.triggerCommand('focusOnAttributes', {tabId: this.tabContext.tabId});
});
-
- return this.$widget;
}
async refreshWithNote(note) {
diff --git a/src/public/app/widgets/note_tree.js b/src/public/app/widgets/note_tree.js
index 270fac24e..7582f0e95 100644
--- a/src/public/app/widgets/note_tree.js
+++ b/src/public/app/widgets/note_tree.js
@@ -250,8 +250,6 @@ export default class NoteTreeWidget extends TabAwareWidget {
this.initialized = this.initFancyTree();
this.setupNoteTitleTooltip();
-
- return this.$widget;
}
setupNoteTitleTooltip() {
diff --git a/src/public/app/widgets/note_type.js b/src/public/app/widgets/note_type.js
index d33e26d17..679d6362e 100644
--- a/src/public/app/widgets/note_type.js
+++ b/src/public/app/widgets/note_type.js
@@ -40,8 +40,6 @@ export default class NoteTypeWidget extends TabAwareWidget {
this.$noteTypeDropdown = this.$widget.find(".note-type-dropdown");
this.$noteTypeButton = this.$widget.find(".note-type-button");
this.$noteTypeDesc = this.$widget.find(".note-type-desc");
-
- return this.$widget;
}
async refreshWithNote(note) {
@@ -147,4 +145,4 @@ export default class NoteTypeWidget extends TabAwareWidget {
this.refresh();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/promoted_attributes.js b/src/public/app/widgets/promoted_attributes.js
index 440112632..e6db996dc 100644
--- a/src/public/app/widgets/promoted_attributes.js
+++ b/src/public/app/widgets/promoted_attributes.js
@@ -32,8 +32,6 @@ export default class PromotedAttributesWidget extends TabAwareWidget {
this.$widget = $(TPL);
this.$container = this.$widget.find(".promoted-attributes");
-
- return this.$widget;
}
async refreshWithNote(note) {
diff --git a/src/public/app/widgets/run_script_buttons.js b/src/public/app/widgets/run_script_buttons.js
index f090e6fb1..c7d752736 100644
--- a/src/public/app/widgets/run_script_buttons.js
+++ b/src/public/app/widgets/run_script_buttons.js
@@ -17,8 +17,6 @@ export default class RunScriptButtonsWidget extends TabAwareWidget {
this.$renderButton = this.$widget.find('.render-button');
this.$executeScriptButton = this.$widget.find('.execute-script-button');
-
- return this.$widget;
}
refreshWithNote(note) {
@@ -31,4 +29,4 @@ export default class RunScriptButtonsWidget extends TabAwareWidget {
this.refresh();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/search_box.js b/src/public/app/widgets/search_box.js
index f0f729dfb..2f4cb8cc5 100644
--- a/src/public/app/widgets/search_box.js
+++ b/src/public/app/widgets/search_box.js
@@ -71,8 +71,6 @@ export default class SearchBoxWidget extends BasicWidget {
this.$saveSearchButton.on('click', () => this.saveSearch());
this.$closeSearchButton.on('click', () => this.hideSearch());
-
- return this.$widget;
}
doSearch(searchText) {
@@ -174,4 +172,4 @@ export default class SearchBoxWidget extends BasicWidget {
this.$searchInput.val(`@in=${noteId} @text*=*`);
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/search_results.js b/src/public/app/widgets/search_results.js
index 2bf539e15..08b0e6f76 100644
--- a/src/public/app/widgets/search_results.js
+++ b/src/public/app/widgets/search_results.js
@@ -35,8 +35,6 @@ export default class SearchResultsWidget extends BasicWidget {
this.$searchResultsInner = this.$widget.find(".search-results-list");
this.toggleInt(false);
-
- return this.$widget;
}
searchResultsEvent({results}) {
diff --git a/src/public/app/widgets/side_pane_toggles.js b/src/public/app/widgets/side_pane_toggles.js
index 43ba442f2..5554d4d85 100644
--- a/src/public/app/widgets/side_pane_toggles.js
+++ b/src/public/app/widgets/side_pane_toggles.js
@@ -43,8 +43,6 @@ export default class SidePaneToggles extends BasicWidget {
this.$widget.find(".show-left-pane-button").on('click', () => this.toggleAndSave('left', true));
this.$widget.find(".hide-left-pane-button").on('click', () => this.toggleAndSave('left', false));
-
- return this.$widget;
}
toggleSidebar(side, show) {
diff --git a/src/public/app/widgets/tab_row.js b/src/public/app/widgets/tab_row.js
index ba8ee27fc..2336717eb 100644
--- a/src/public/app/widgets/tab_row.js
+++ b/src/public/app/widgets/tab_row.js
@@ -267,8 +267,6 @@ export default class TabRowWidget extends BasicWidget {
}
});
});
-
- return this.$widget;
}
setupStyle() {
diff --git a/src/public/app/widgets/title_bar_buttons.js b/src/public/app/widgets/title_bar_buttons.js
index 6be2e2dae..3d443d7e0 100644
--- a/src/public/app/widgets/title_bar_buttons.js
+++ b/src/public/app/widgets/title_bar_buttons.js
@@ -63,7 +63,5 @@ export default class TitleBarButtonsWidget extends BasicWidget {
const {remote} = utils.dynamicRequire('electron');
remote.BrowserWindow.getFocusedWindow().close();
});
-
- return this.$widget;
}
}
diff --git a/src/public/app/widgets/type_widgets/book.js b/src/public/app/widgets/type_widgets/book.js
index a4876ca55..451a44083 100644
--- a/src/public/app/widgets/type_widgets/book.js
+++ b/src/public/app/widgets/type_widgets/book.js
@@ -170,8 +170,6 @@ export default class BookTypeWidget extends TypeWidget {
$card.find('.note-book-children-content').empty();
});
-
- return this.$widget;
}
async expandCard($card) {
diff --git a/src/public/app/widgets/type_widgets/deleted.js b/src/public/app/widgets/type_widgets/deleted.js
index cbf4cb903..56e7d0f21 100644
--- a/src/public/app/widgets/type_widgets/deleted.js
+++ b/src/public/app/widgets/type_widgets/deleted.js
@@ -14,7 +14,5 @@ export default class DeletedTypeWidget extends TypeWidget {
doRender() {
this.$widget = $(TPL);
-
- return this.$widget;
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/type_widgets/editable_code.js b/src/public/app/widgets/type_widgets/editable_code.js
index b3d7efd4b..88d20f535 100644
--- a/src/public/app/widgets/type_widgets/editable_code.js
+++ b/src/public/app/widgets/type_widgets/editable_code.js
@@ -82,8 +82,6 @@ export default class EditableCodeTypeWidget extends TypeWidget {
this.$sqlConsoleExecuteButton.on('click', () => this.execute());
this.initialized = this.initEditor();
-
- return this.$widget;
}
async initEditor() {
diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
index e413b8e2c..89d2239ef 100644
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -88,8 +88,6 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
keyboardActionService.setupActionsForElement('text-detail', this.$widget, this);
super.doRender();
-
- return this.$widget;
}
async initEditor() {
diff --git a/src/public/app/widgets/type_widgets/empty.js b/src/public/app/widgets/type_widgets/empty.js
index d5ebda060..4ca8f5a6b 100644
--- a/src/public/app/widgets/type_widgets/empty.js
+++ b/src/public/app/widgets/type_widgets/empty.js
@@ -31,11 +31,9 @@ export default class EmptyTypeWidget extends TypeWidget {
});
noteAutocompleteService.showRecentNotes(this.$autoComplete);
-
- return this.$widget;
}
doRefresh(note) {
this.$autoComplete.trigger('focus');
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/type_widgets/file.js b/src/public/app/widgets/type_widgets/file.js
index 08045c49c..dfa84ce29 100644
--- a/src/public/app/widgets/type_widgets/file.js
+++ b/src/public/app/widgets/type_widgets/file.js
@@ -116,8 +116,6 @@ export default class FileTypeWidget extends TypeWidget {
toastService.showError("Upload of a new file revision failed.");
}
});
-
- return this.$widget;
}
async doRefresh(note) {
diff --git a/src/public/app/widgets/type_widgets/image.js b/src/public/app/widgets/type_widgets/image.js
index 8bed7be4e..a0baf4117 100644
--- a/src/public/app/widgets/type_widgets/image.js
+++ b/src/public/app/widgets/type_widgets/image.js
@@ -119,8 +119,6 @@ class ImageTypeWidget extends TypeWidget {
toastService.showError("Upload of a new image revision failed: " + result.message);
}
});
-
- return this.$widget;
}
async doRefresh(note) {
diff --git a/src/public/app/widgets/type_widgets/protected_session.js b/src/public/app/widgets/type_widgets/protected_session.js
index 487933ec3..70617406d 100644
--- a/src/public/app/widgets/type_widgets/protected_session.js
+++ b/src/public/app/widgets/type_widgets/protected_session.js
@@ -36,7 +36,5 @@ export default class ProtectedSessionTypeWidget extends TypeWidget {
return false;
});
-
- return this.$widget;
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/type_widgets/read_only_code.js b/src/public/app/widgets/type_widgets/read_only_code.js
index e8cf37a01..1ed5c5740 100644
--- a/src/public/app/widgets/type_widgets/read_only_code.js
+++ b/src/public/app/widgets/type_widgets/read_only_code.js
@@ -32,8 +32,6 @@ export default class ReadOnlyCodeTypeWidget extends TypeWidget {
this.triggerEvent('codePreviewDisabled', {tabContext: this.tabContext});
});
-
- return this.$widget;
}
async doRefresh(note) {
diff --git a/src/public/app/widgets/type_widgets/read_only_text.js b/src/public/app/widgets/type_widgets/read_only_text.js
index 4d4c384fc..ffedbaba0 100644
--- a/src/public/app/widgets/type_widgets/read_only_text.js
+++ b/src/public/app/widgets/type_widgets/read_only_text.js
@@ -52,8 +52,6 @@ export default class ReadOnlyTextTypeWidget extends AbstractTextTypeWidget {
});
super.doRender();
-
- return this.$widget;
}
cleanup() {
diff --git a/src/public/app/widgets/type_widgets/relation_map.js b/src/public/app/widgets/type_widgets/relation_map.js
index 4d70946dc..0c01e1e43 100644
--- a/src/public/app/widgets/type_widgets/relation_map.js
+++ b/src/public/app/widgets/type_widgets/relation_map.js
@@ -182,8 +182,6 @@ export default class RelationMapTypeWidget extends TypeWidget {
jsPlumb.ready(res);
});
-
- return this.$widget;
}
async contextMenuHandler(command, originalTarget) {
@@ -632,4 +630,4 @@ export default class RelationMapTypeWidget extends TypeWidget {
getContent() {
return JSON.stringify(this.mapData);
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/type_widgets/render.js b/src/public/app/widgets/type_widgets/render.js
index 111d2dba2..58bb6532c 100644
--- a/src/public/app/widgets/type_widgets/render.js
+++ b/src/public/app/widgets/type_widgets/render.js
@@ -25,8 +25,6 @@ export default class RenderTypeWidget extends TypeWidget {
this.$widget = $(TPL);
this.$noteDetailRenderHelp = this.$widget.find('.note-detail-render-help');
this.$noteDetailRenderContent = this.$widget.find('.note-detail-render-content');
-
- return this.$widget;
}
async doRefresh(note) {
@@ -49,4 +47,4 @@ export default class RenderTypeWidget extends TypeWidget {
this.refresh();
}
}
-}
\ No newline at end of file
+}
diff --git a/src/public/app/widgets/type_widgets/search.js b/src/public/app/widgets/type_widgets/search.js
index 8b2f0ad94..81993b25b 100644
--- a/src/public/app/widgets/type_widgets/search.js
+++ b/src/public/app/widgets/type_widgets/search.js
@@ -20,8 +20,6 @@ export default class SearchTypeWidget extends TypeWidget {
this.$searchString = this.$widget.find(".search-string");
this.$component = this.$widget.find('.note-detail-search');
this.$help = this.$widget.find(".note-detail-search-help");
-
- return this.$widget;
}
async doRefresh(note) {
@@ -48,4 +46,4 @@ export default class SearchTypeWidget extends TypeWidget {
searchString: this.$searchString.val()
});
}
-}
\ No newline at end of file
+}