New: close modal dialogs by clicking outside of modal

pull/3113/head
Mark McDowall 10 years ago
parent 9ffdf18935
commit 9f52daf78e

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Select Folder</h3> <h3>Select Folder</h3>
@ -28,5 +27,4 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>NzbDrone Calendar feed</h3> <h3>NzbDrone Calendar feed</h3>
@ -26,5 +25,4 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="episode-detail-modal"> <div class="episode-detail-modal">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@ -32,6 +31,4 @@
<button class="btn btn-default" data-dismiss="modal">close</button> <button class="btn btn-default" data-dismiss="modal">close</button>
</div> </div>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="history-detail-modal"> <div class="history-detail-modal">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@ -19,5 +18,4 @@
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Keyboard Shortcuts</h3> <h3>Keyboard Shortcuts</h3>
@ -43,5 +42,4 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="rename-preview-modal"> <div class="rename-preview-modal">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@ -25,5 +24,4 @@
<button class="btn btn-primary x-organize">Organize</button> <button class="btn btn-primary x-organize">Organize</button>
</div> </div>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete {{title}}</h3> <h3>Delete {{title}}</h3>
@ -44,5 +43,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button> <button class="btn btn-danger x-confirm-delete">delete</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>{{title}}</h3> <h3>{{title}}</h3>
@ -93,5 +92,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-primary x-save">save</button> <button class="btn btn-primary x-save">save</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Organize of Selected Series</h3> <h3>Organize of Selected Series</h3>
@ -23,5 +22,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-organize">organize</button> <button class="btn btn-danger x-confirm-organize">organize</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Add Download Client</h3> <h3>Add Download Client</h3>
@ -12,5 +11,4 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete Download Client</h3> <h3>Delete Download Client</h3>
@ -11,5 +10,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button> <button class="btn btn-danger x-confirm-delete">delete</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
{{#if id}} {{#if id}}
@ -62,5 +61,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Add Indexer</h3> <h3>Add Indexer</h3>
@ -12,5 +11,4 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete Indexer</h3> <h3>Delete Indexer</h3>
@ -11,5 +10,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button> <button class="btn btn-danger x-confirm-delete">delete</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close x-close" aria-hidden="true">&times;</button> <button type="button" class="close x-close" aria-hidden="true">&times;</button>
{{#if id}} {{#if id}}
@ -61,5 +60,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Edit</h3> <h3>Edit</h3>
@ -41,5 +40,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-primary x-save">save</button> <button class="btn btn-primary x-save">save</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Add Notification</h3> <h3>Add Notification</h3>
@ -12,5 +11,4 @@
<div class="modal-footer"> <div class="modal-footer">
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete Notification</h3> <h3>Delete Notification</h3>
@ -11,5 +10,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button> <button class="btn btn-danger x-confirm-delete">delete</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close x-cancel" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close x-cancel" data-dismiss="modal" aria-hidden="true">&times;</button>
{{#if id}} {{#if id}}
@ -110,5 +109,4 @@
</ul> </ul>
</div> </div>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h3>Delete: {{name}}</h3> <h3>Delete: {{name}}</h3>
@ -11,5 +10,4 @@
<button class="btn" data-dismiss="modal">cancel</button> <button class="btn" data-dismiss="modal">cancel</button>
<button class="btn btn-danger x-confirm-delete">delete</button> <button class="btn btn-danger x-confirm-delete">delete</button>
</div> </div>
</div>
</div> </div>

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close x-cancel" aria-hidden="true">&times;</button> <button type="button" class="close x-cancel" aria-hidden="true">&times;</button>
{{#if id}} {{#if id}}
@ -7,7 +6,7 @@
{{else}} {{else}}
<h3>Add</h3> <h3>Add</h3>
{{/if}} {{/if}}
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="form-horizontal"> <div class="form-horizontal">
<div id="x-fields"></div> <div id="x-fields"></div>
@ -33,5 +32,4 @@
<button class="btn x-cancel">cancel</button> <button class="btn x-cancel">cancel</button>
<button class="btn btn-primary x-save">save</button> <button class="btn btn-primary x-save">save</button>
</div> </div>
</div>
</div> </div>

@ -5,7 +5,7 @@ define(
'backbone', 'backbone',
'marionette', 'marionette',
'bootstrap' 'bootstrap'
], function ($,Backbone, Marionette) { ], function ($, Backbone, Marionette) {
var region = Marionette.Region.extend({ var region = Marionette.Region.extend({
el: '#modal-region', el: '#modal-region',
@ -27,9 +27,12 @@ define(
//https://github.com/twitter/bootstrap/issues/4663 //https://github.com/twitter/bootstrap/issues/4663
this.$el.attr('tabindex', '-1'); this.$el.attr('tabindex', '-1');
this.$el.modal({ this.$el.modal({
'show' : true, show : true,
'keyboard': true, keyboard : true,
'backdrop': 'static'}); backdrop : true
});
this.currentView.$el.addClass('modal-dialog');
}, },
closeModal: function () { closeModal: function () {

@ -1,5 +1,4 @@
<div class="modal-dialog"> <div class="modal-content">
<div class="modal-content">
<div class="log-details-modal"> <div class="log-details-modal">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@ -21,5 +20,4 @@
<button class="btn" data-dismiss="modal">close</button> <button class="btn" data-dismiss="modal">close</button>
</div> </div>
</div> </div>
</div>
</div> </div>

Loading…
Cancel
Save