From ee5170424e8dc571b3a811e02f906aef5ee49e83 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Wed, 10 Aug 2016 10:01:05 +0300
Subject: dojo: main UI: load stuff asynchronously

---
 plugins/af_zz_noautoplay/init.js | 59 +++++++++++++++++++++-------------------
 plugins/shorten_expanded/init.js | 34 +++++++++++++----------
 2 files changed, 50 insertions(+), 43 deletions(-)

(limited to 'plugins')

diff --git a/plugins/af_zz_noautoplay/init.js b/plugins/af_zz_noautoplay/init.js
index 9b7bf0077..3cf3a381c 100644
--- a/plugins/af_zz_noautoplay/init.js
+++ b/plugins/af_zz_noautoplay/init.js
@@ -1,40 +1,43 @@
-dojo.addOnLoad(function() {
-	PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
-		if (row) {
-			console.log("af_zz_noautoplay!");
-			console.log(row);
-
-			var videos = row.getElementsByTagName("video");
-			console.log(row.innerHTML);
-
-			for (i = 0; i < videos.length; i++) {
-
-				videos[i].removeAttribute("autoplay");
-				videos[i].pause();
-				videos[i].onclick = function() {
-					this.paused ? this.play() : this.pause();
+require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
+	dojo.addOnLoad(function () {
+		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function (row) {
+			if (row) {
+				console.log("af_zz_noautoplay!");
+				console.log(row);
+
+				var videos = row.getElementsByTagName("video");
+				console.log(row.innerHTML);
+
+				for (i = 0; i < videos.length; i++) {
+
+					videos[i].removeAttribute("autoplay");
+					videos[i].pause();
+					videos[i].onclick = function () {
+						this.paused ? this.play() : this.pause();
+					}
 				}
 			}
-		}
 
-		return true;
-	});
+			return true;
+		});
 
-	PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED, function(row) {
-		if (row) {
-			var videos = row.getElementsByTagName("video");
+		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED, function (row) {
+			if (row) {
+				var videos = row.getElementsByTagName("video");
 
-			for (i = 0; i < videos.length; i++) {
-				videos[i].removeAttribute("autoplay");
-				videos[i].pause();
-				videos[i].onclick = function() {
-					this.paused ? this.play() : this.pause();
+				for (i = 0; i < videos.length; i++) {
+					videos[i].removeAttribute("autoplay");
+					videos[i].pause();
+					videos[i].onclick = function () {
+						this.paused ? this.play() : this.pause();
+					}
 				}
+
 			}
 
-		}
+			return true;
+		});
 
-		return true;
 	});
 
 });
\ No newline at end of file
diff --git a/plugins/shorten_expanded/init.js b/plugins/shorten_expanded/init.js
index 5e9e84aec..899f8a54d 100644
--- a/plugins/shorten_expanded/init.js
+++ b/plugins/shorten_expanded/init.js
@@ -22,26 +22,30 @@ function expandSizeWrapper(id) {
 
 }
 
-dojo.addOnLoad(function() {
-	PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
-		if (getInitParam('cdm_expanded')) {
+require(['dojo/_base/kernel', 'dojo/ready'], function  (dojo, ready) {
 
-			window.setTimeout(function() {
-				if (row) {
-					if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
-						var content = row.select(".cdmContentInner")[0];
+	dojo.addOnLoad(function() {
+		PluginHost.register(PluginHost.HOOK_ARTICLE_RENDERED_CDM, function(row) {
+			if (getInitParam('cdm_expanded')) {
 
-						if (content) {
-							content.innerHTML = "<div class='contentSizeWrapper'>" +
-								content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
-								"href='#'>" + __("Click to expand article") + "</button>";
+				window.setTimeout(function() {
+					if (row) {
+						if (row.offsetHeight >= _shorten_expanded_threshold * window.innerHeight) {
+							var content = row.select(".cdmContentInner")[0];
 
+							if (content) {
+								content.innerHTML = "<div class='contentSizeWrapper'>" +
+									content.innerHTML + "</div><button class='expandPrompt' onclick='return expandSizeWrapper(\""+row.id+"\")' "+
+									"href='#'>" + __("Click to expand article") + "</button>";
+
+							}
 						}
 					}
-				}
-			}, 150);
-		}
+				}, 150);
+			}
 
-		return true;
+			return true;
+		});
 	});
+
 });
-- 
cgit v1.2.3