Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2018-06-14 05:36:38 +0300
committerdiosmosis <diosmosis@users.noreply.github.com>2018-06-14 05:36:38 +0300
commit6a0c96034683b34e632ef576b73be85695d439a3 (patch)
tree70a8b6e7e471bca7e39fa808d2b2b74ff70552a1 /plugins/Widgetize
parent8b5f334e0deb865af56a3b84133b7a7c1575bb1d (diff)
Remove usage of synchronous ajax requests (#12546)
* Do not use sync ajax requests * adds deprecation comments * convert some methods to be fully async * adds minimum waittime after page load in ui tests * improve wait times
Diffstat (limited to 'plugins/Widgetize')
-rw-r--r--plugins/Widgetize/angularjs/widget-preview/widget-preview.directive.js53
1 files changed, 27 insertions, 26 deletions
diff --git a/plugins/Widgetize/angularjs/widget-preview/widget-preview.directive.js b/plugins/Widgetize/angularjs/widget-preview/widget-preview.directive.js
index 6694b15fae..eb9961548b 100644
--- a/plugins/Widgetize/angularjs/widget-preview/widget-preview.directive.js
+++ b/plugins/Widgetize/angularjs/widget-preview/widget-preview.directive.js
@@ -52,37 +52,38 @@
};
this.callbackAddExportButtonsUnderWidget = function (widgetUniqueId, loadedWidgetElement) {
- var widget = widgetsHelper.getWidgetObjectFromUniqueId(widgetUniqueId);
- var widgetParameters = widget['parameters'];
+ widgetsHelper.getWidgetObjectFromUniqueId(widgetUniqueId, function(widget) {
+ var widgetParameters = widget['parameters'];
- var exportButtonsElement = $('<span id="exportButtons">');
+ var exportButtonsElement = $('<span id="exportButtons">');
- var urlIframe = getEmbedUrl(widgetParameters, "iframe");
- // We first build the HTML code that will load the widget in an IFRAME
- var widgetIframeHtml = '<div id="widgetIframe">' +
- '<iframe width="100%" height="350" src="' + urlIframe + '" scrolling="no" frameborder="0" marginheight="0" marginwidth="0">' +
- '</iframe>' +
- '</div>';
+ var urlIframe = getEmbedUrl(widgetParameters, "iframe");
+ // We first build the HTML code that will load the widget in an IFRAME
+ var widgetIframeHtml = '<div id="widgetIframe">' +
+ '<iframe width="100%" height="350" src="' + urlIframe + '" scrolling="no" frameborder="0" marginheight="0" marginwidth="0">' +
+ '</iframe>' +
+ '</div>';
- // Add the input field containing the widget in an Iframe
- $(exportButtonsElement).append(
- '<div id="embedThisWidgetIframe">' +
- '<label for="embedThisWidgetIframeInput">&rsaquo; Embed Iframe</label>' +
- '<div id="embedThisWidgetIframeInput">' +
- self.getInputFormWithHtml('iframeEmbed', widgetIframeHtml) +
- '</div>' +
- '</div>' +
- '<div> <label for="embedThisWidgetDirectLink">&rsaquo; Direct Link</label>' +
- '<div id="embedThisWidgetDirectLink"> ' + self.getInputFormWithHtml('directLinkEmbed', urlIframe) + ' - <a href="' + urlIframe + '" rel="noreferrer" target="_blank">' + _pk_translate('Widgetize_OpenInNewWindow') + '</a></div>'
- + '</div>'
- );
+ // Add the input field containing the widget in an Iframe
+ $(exportButtonsElement).append(
+ '<div id="embedThisWidgetIframe">' +
+ '<label for="embedThisWidgetIframeInput">&rsaquo; Embed Iframe</label>' +
+ '<div id="embedThisWidgetIframeInput">' +
+ self.getInputFormWithHtml('iframeEmbed', widgetIframeHtml) +
+ '</div>' +
+ '</div>' +
+ '<div> <label for="embedThisWidgetDirectLink">&rsaquo; Direct Link</label>' +
+ '<div id="embedThisWidgetDirectLink"> ' + self.getInputFormWithHtml('directLinkEmbed', urlIframe) + ' - <a href="' + urlIframe + '" rel="noreferrer" target="_blank">' + _pk_translate('Widgetize_OpenInNewWindow') + '</a></div>'
+ + '</div>'
+ );
- // Finally we append the content to the parent widget DIV
- $(loadedWidgetElement)
- .parent()
- .append(exportButtonsElement);
+ // Finally we append the content to the parent widget DIV
+ $(loadedWidgetElement)
+ .parent()
+ .append(exportButtonsElement);
- piwik.helper.compileAngularComponents(exportButtonsElement);
+ piwik.helper.compileAngularComponents(exportButtonsElement);
+ });
}
},
compile: function (element, attrs) {