diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js index 132e7cf1..4f12b859 100644 --- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js +++ b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.Request.js @@ -37,6 +37,12 @@ BootstrapDialog.Request = new Class({ }); me.show(); }); + }, + + onDialogShown: function() { + if (typeof(onDialogShown) == "function") { + onDialogShown(); + } } diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js index 7696dfd1..e1dbcc88 100644 --- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js +++ b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js @@ -34,6 +34,7 @@ var BootstrapDialog = new Class({ content.append(footer); } this._native.find(".modal-dialog").append(content); + this._native.on('shown.bs.modal', this.onDialogShown); }, _buildFooter: function() { @@ -78,7 +79,9 @@ var BootstrapDialog = new Class({ //this method should be abstract }, + onDialogShown: function() { + }, onRemoveClick: function(event) { event.data.model.setValue(null); event.data.dialog.close(); diff --git a/mindplot/src/main/javascript/widget/LinkEditor.js b/mindplot/src/main/javascript/widget/LinkEditor.js index 52e57ceb..dd9c7226 100644 --- a/mindplot/src/main/javascript/widget/LinkEditor.js +++ b/mindplot/src/main/javascript/widget/LinkEditor.js @@ -51,7 +51,7 @@ mindplot.widget.LinkEditor = new Class({ }); // Add Input - var input = $('').attr({ + var input = $('').attr({ 'placeholder': 'http://www.example.com/', 'required': 'true', 'autofocus': 'autofocus', @@ -116,6 +116,10 @@ mindplot.widget.LinkEditor = new Class({ if (!this.formSubmitted) { event.stopPropagation(); } + }, + + onDialogShown: function() { + $(this).find('#inputUrl').focus(); } }); diff --git a/mindplot/src/main/javascript/widget/NoteEditor.js b/mindplot/src/main/javascript/widget/NoteEditor.js index ee234d8f..e500e8c4 100644 --- a/mindplot/src/main/javascript/widget/NoteEditor.js +++ b/mindplot/src/main/javascript/widget/NoteEditor.js @@ -44,10 +44,9 @@ mindplot.widget.NoteEditor = new Class({ }); // Add textarea - var textArea = $('').attr({ + var textArea = $('').attr({ 'placeholder':$msg('WRITE_YOUR_TEXT_HERE'), 'required':'true', - 'autofocus':'autofocus', 'class':'form-control' }); textArea.css({ @@ -82,6 +81,10 @@ mindplot.widget.NoteEditor = new Class({ onAcceptClick: function() { $("#noteFormId").submit(); + }, + + onDialogShown: function() { + $(this).find('textarea').focus(); } }); diff --git a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp index 974bd8e9..115a6877 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp @@ -71,7 +71,7 @@

:

- "/>
@@ -113,6 +113,10 @@ $("#collabEmails").keyup(function(event) { } }); +function onDialogShown() { + $('#collabEmails').focus(); +} + var messages = { owner:'', editor:'',