TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the double-popup animation effect due to bad nesting (#2058)

This commit is contained in:
Jérémy Gaulin 2016-05-27 00:53:17 +02:00 committed by Samuel Georges
parent e512dc7167
commit a888fe6e47
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
modules/system/assets/js/eventlogs/exception-beautifier.links.js
View File

@ -37,31 +37,24 @@
open = $.oc.lang.get('eventlog.editor.open'),
cancel = $.oc.lang.get('eventlog.editor.cancel'),
popup = $(' \
<div class="control-popup modal fade" id="exception-link-editor" tabindex="-1" role="dialog"> \
<div class="modal-dialog"> \
<div class="modal-content"> \
<div class="modal-header"> \
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> \
<h4 class="modal-title">' + title + '</h4> \
</div> \
<div class="modal-body"> \
<p>' + description + '</p> \
<div class="form-group"> \
<label class="control-label">' + openWith + ':</label> \
<select class="form-control" name="select-exception-link-editor"></select> \
</div> \
<div class="checkbox custom-checkbox"> \
<input name="checkbox" value="1" type="checkbox" id="editor-remember-choice" /> \
<label for="editor-remember-choice">' + rememberChoice + '</label> \
</div> \
</div> \
<div class="modal-footer"> \
<button type="button" class="btn btn-primary" \
data-action="submit" data-dismiss="modal">' + open + '</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">' + cancel + '</button> \
</div> \
</div> \
<div class="modal-header"> \
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> \
<h4 class="modal-title">' + title + '</h4> \
</div> \
<div class="modal-body"> \
<p>' + description + '</p> \
<div class="form-group"> \
<label class="control-label">' + openWith + ':</label> \
<select class="form-control" name="select-exception-link-editor"></select> \
</div> \
<div class="checkbox custom-checkbox"> \
<input name="checkbox" value="1" type="checkbox" id="editor-remember-choice" /> \
<label for="editor-remember-choice">' + rememberChoice + '</label> \
</div> \
</div> \
<div class="modal-footer"> \
<button type="button" class="btn btn-primary" data-action="submit" data-dismiss="modal">' + open + '</button> \
<button type="button" class="btn btn-default" data-dismiss="popup">' + cancel + '</button> \
</div>'
),
select = $('select', popup)
@ -72,7 +65,7 @@
}
}
ExceptionBeautifier.LINKER_POPUP_CONTENT = popup.html()
ExceptionBeautifier.LINKER_POPUP_CONTENT = popup
}
}