').html(Messages.creation_newPadModalDescription);
$modal.find('.cp-modal').append($title);
@@ -2634,7 +2635,7 @@ define([
$modal.find('.cp-modal').append($container).append($advancedContainer);
window.setTimeout(function () {
- $modal.show();
+ modal.show();
$modal.focus();
});
};
diff --git a/www/common/diffMarked.js b/www/common/diffMarked.js
index ccf240685..c385a606c 100644
--- a/www/common/diffMarked.js
+++ b/www/common/diffMarked.js
@@ -351,6 +351,7 @@ define([
var onPreview = function ($mt) {
return function () {
+ var isSvg = $mt.is('pre.mermaid');
var mts = [];
$content.find('media-tag, pre.mermaid').each(function (i, el) {
if (el.nodeName.toLowerCase() === "pre") {
@@ -368,16 +369,26 @@ define([
// Find initial position
var idx = -1;
mts.some(function (obj, i) {
- if (obj.src === $mt.attr('src')) {
+ if (isSvg && $mt.find('svg').attr('id') === $(obj.svg).find('svg').attr('id')) {
+ idx = i;
+ return true;
+ }
+ if (!isSvg && obj.src === $mt.attr('src')) {
idx = i;
return true;
}
});
if (idx === -1) {
- mts.unshift({
- src: $mt.attr('src'),
- key: $mt.attr('data-crypto-key')
- });
+ if (isSvg) {
+ mts.unshift({
+ svg: $mt[0].cloneNode(true)
+ });
+ } else {
+ mts.unshift({
+ src: $mt.attr('src'),
+ key: $mt.attr('data-crypto-key')
+ });
+ }
idx = 0;
}
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 7c76d3255..899405fa1 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -2946,17 +2946,18 @@ define([
$element.append($('', {'class': 'cp-app-drive-element-name'})
.text(Messages.fm_newFile));
$element.click(function () {
- var $modal = UI.createModal({
+ var modal = UI.createModal({
id: 'cp-app-drive-new-ghost-dialog',
$body: $('body')
});
+ var $modal = modal.$modal;
var $title = $(' ').text(Messages.fm_newButtonTitle);
$modal.find('.cp-modal').append($title);
$modal.find('.cp-modal').append($description);
var $content = createNewPadIcons($modal, isInRoot);
$modal.find('.cp-modal').append($content);
- window.setTimeout(function () { $modal.show(); });
+ window.setTimeout(function () { modal.show(); });
addNewPadHandlers($modal, isInRoot);
});
};
diff --git a/www/common/inner/common-mediatag.js b/www/common/inner/common-mediatag.js
index a4145c6f9..001bae062 100644
--- a/www/common/inner/common-mediatag.js
+++ b/www/common/inner/common-mediatag.js
@@ -216,52 +216,24 @@ define([
var priv = metadataMgr.getPrivateData();
var left, right;
- var checkSize = function () {};
- var $modal = UI.createModal({
+ var modal = UI.createModal({
id: 'cp-mediatag-preview-modal',
- onClose: function () {
- $(window).off('resize', checkSize);
- },
$body: $('body')
- }).show().focus();
- var $container = $modal.find('.cp-modal').append(h('div.cp-mediatag-outer', [
+ });
+ modal.show();
+ var $modal = modal.$modal.focus();
+ var $container = $modal.find('.cp-modal').append([
h('div.cp-mediatag-control', left = h('span.fa.fa-chevron-left')),
h('div.cp-mediatag-container', [
h('div.cp-loading-spinner-container', h('span.cp-spinner')),
]),
h('div.cp-mediatag-control', right = h('span.fa.fa-chevron-right')),
- ]));
+ ]);
var $left = $(left);
var $right = $(right);
var $inner = $container.find('.cp-mediatag-container');
- var el;
- checkSize = function () {
- if (!el) { return; }
-
- if (el.nodeName === 'BUTTON') {
- return $container.find('.cp-mediatag-container').css('height', 'auto');
- }
-
- var size = el.naturalHeight || el.videoHeight;
- if ($(el).find('svg').length) {
- var h = $(el).find('svg').prop('height');
- size = Number(h) || (h.baseVal && h.baseVal.value);
- }
- if (el.nodeName !== 'IMG' && el.nodeName !== 'VIDEO') {
- $container.find('.cp-mediatag-container').css('height', '100%');
- }
- if (!size) { return; }
- // Center small images and videos
- $container.find('.cp-mediatag-container').css('height', '100%');
- if (size < $container.height()) {
- $container.find('.cp-mediatag-container').css('height', 'auto');
- }
- };
-
- $(window).on('resize', checkSize);
-
var $spinner = $container.find('.cp-loading-spinner-container');
var locked = false;
@@ -292,8 +264,6 @@ define([
if (cfg.svg) {
$spinner.hide();
$inner.append(cfg.svg);
- el = cfg.svg;
- checkSize();
locked = false;
return;
}
@@ -321,24 +291,9 @@ define([
$inner.append(tag);
var observer = new MutationObserver(function(mutations) {
- mutations.forEach(function(mutation) {
+ mutations.forEach(function() {
locked = false;
$spinner.hide();
- if (mutation.addedNodes.length === 1) {
- el = mutation.addedNodes[0];
- if (el.readyState === 0) {
- // Wait for the video to be ready before checking the size
- el.onloadedmetadata = checkSize;
- return;
- }
- if (el.complete === false) {
- el.onload = checkSize;
- return;
- }
- setTimeout(function () {
- checkSize();
- });
- }
});
});
observer.observe(tag, {
diff --git a/www/filepicker/inner.js b/www/filepicker/inner.js
index 2eb9b4120..205a0b8db 100644
--- a/www/filepicker/inner.js
+++ b/www/filepicker/inner.js
@@ -81,11 +81,13 @@ define([
var createFileDialog = function () {
var types = filters.types || [];
// Create modal
- var $blockContainer = UI.createModal({
+ var modal = UI.createModal({
id: 'cp-filepicker-dialog',
$body: $body,
onClose: hideFileDialog
- }).show();
+ });
+ modal.show();
+ var $blockContainer = modal.$modal;
// Set the fixed content
var $block = $blockContainer.find('.cp-modal');
diff --git a/www/teams/inner.js b/www/teams/inner.js
index ae67c6f6e..af011167d 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -535,9 +535,11 @@ define([
};
var makePermissions = function () {
- var $blockContainer = UI.createModal({
+ var modal= UI.createModal({
id: 'cp-teams-roster-dialog',
- }).show();
+ });
+ modal.show();
+ var $blockContainer = modal.$modal;
var makeRow = function (arr, first) {
return arr.map(function (val) {
').text(Messages.fm_newFile);
var $description = $('