Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Fix dialog positioning #5399

Merged
merged 2 commits into from
Oct 9, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/styles/bootstrap/modals.less
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@
.modal {
position: fixed;
top: 50%;//changed from 10%
left: 50%;
z-index: @zindexModal;
width: 600px;
margin: -250px 0 0 -280px;//changed from -280px
background-color: @white;
border: 1px solid #999;
border: 1px solid rgba(0,0,0,.3);
Expand Down
54 changes: 37 additions & 17 deletions src/styles/brackets_patterns_override.less
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,27 @@

/* Dialog-related styles */

.modal-wrapper {
width: 100%;
height: 100%;
position: absolute;
top: 0;
left: 0;
overflow: auto;
display: table;
}

.modal-inner-wrapper {
display: table-cell;
vertical-align: middle;
}

.modal {
background-color: @tc-gray-panel;
width: auto;
min-width: 200px;
position: relative;
top: 0;
margin: auto;
}

.modal .close {
Expand All @@ -392,11 +410,15 @@
border-bottom: 1px solid @tc-gray-panel-separator;
}

.modal-body, .modal-header {
.modal-body {
background-color: @tc-gray-panel;
}

.modal-body, .modal-header, .modal-footer {
/* See styles/bootstrap/patterns.less .modal class.
Pushing this value down to .modal-header and .modal-body
to allow the overall modal to take the width of the footer */
width: 580px;
width: 560px;
}

.modal-footer {
Expand Down Expand Up @@ -558,27 +580,21 @@ a[href^="http"] {
width: 400px;
}

.install-extension-dialog {
margin-top: -125px;
}
.install-extension-dialog .modal-body input.url {
margin: 10px 0;
width: 550px;
}

/* Extension Manager dialog */
.extension-manager-dialog {
top: 50%;
left: 50%;
margin-top: -275px;
margin-left: -350px;
background-color: #d4d7d7;

width: 760px;

.modal-header {
border-bottom: none;
width: 760px;
padding: 0;
width: auto;


.nav-tabs {
margin: 0;
border-color: #c3c6c5;
Expand Down Expand Up @@ -663,12 +679,12 @@ a[href^="http"] {
}
}
.modal-body {
width: 730px;
height: 400px;
overflow-y: scroll;
padding: 0;
background-color: @tc-gray-panel;

padding: 0;
width: 760px;

.empty-message {
position: absolute;
top: 50%;
Expand Down Expand Up @@ -743,6 +759,10 @@ a[href^="http"] {
}
}
}

.modal-footer {
width: 730px;
}
}

/* About dialog */
Expand Down Expand Up @@ -897,7 +917,7 @@ input[type="color"],
background-color: @tc-button-background;
text-shadow: @tc-text-shadow;
color: @tc-text;
cursor: default;
cursor: default;
font-size: (@baseFontSize + 1);
font-weight: @font-weight-semibold;
line-height: normal;
Expand Down
32 changes: 18 additions & 14 deletions src/widgets/Dialogs.js
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
/*
* Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
*
*/


Expand Down Expand Up @@ -69,6 +69,7 @@ define(function (require, exports, module) {
function _dismissDialog($dlg, buttonId) {
$dlg.data("buttonId", buttonId);
$dlg.modal("hide");
$(".modal-wrapper:last").remove();
}

/**
Expand Down Expand Up @@ -223,11 +224,13 @@ define(function (require, exports, module) {
autoDismiss = true;
}

$("body").append("<div class='modal-wrapper'><div class='modal-inner-wrapper'></div></div>");

var result = $.Deferred(),
promise = result.promise(),
$dlg = $(template)
.addClass("instance")
.appendTo(window.document.body);
.appendTo(".modal-inner-wrapper:last");

// Save the dialog promise for unit tests
$dlg.data("promise", promise);
Expand Down Expand Up @@ -282,6 +285,7 @@ define(function (require, exports, module) {
.modal({
backdrop: "static",
show: true,
selector: ".modal-inner-wrapper:last",
keyboard: false // handle the ESC key ourselves so we can deal with nested dialogs
})
// Updates the z-index of the modal dialog and the backdrop
Expand Down Expand Up @@ -321,7 +325,7 @@ define(function (require, exports, module) {
}

/**
* Immediately closes any dialog instances with the given class. The dialog callback for each instance will
* Immediately closes any dialog instances with the given class. The dialog callback for each instance will
* be called with the special buttonId DIALOG_CANCELED (note: callback is run asynchronously).
* @param {string} dlgClass The class name identifier for the dialog.
* @param {string=} buttonId The button id to use when closing the dialog. Defaults to DIALOG_CANCELED
Expand Down
5 changes: 3 additions & 2 deletions src/widgets/bootstrap-modal.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
var transition = $.support.transition && that.$element.hasClass('fade')

if (!that.$element.parent().length) {
that.$element.appendTo(document.body) //don't move modals dom position
that.$element.appendTo(this.options.selector) //don't move modals dom position
}

that.$element.show()
Expand Down Expand Up @@ -160,7 +160,7 @@
var doAnimate = $.support.transition && animate

this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
.appendTo(document.body)
.appendTo(this.options.selector)

this.$backdrop.click(
this.options.backdrop == 'static' ?
Expand Down Expand Up @@ -212,6 +212,7 @@
backdrop: true
, keyboard: true
, show: true
, selector: "body"
}

$.fn.modal.Constructor = Modal
Expand Down