Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256446
Change subject: Use mediawiki.util to insert style tags
......................................................................
Use mediawiki.util to insert style tags
jquery.loadingSpinner had it's own style insertion, which was throwing
errors. This seemed the simplest solution.
Bug: T118792
Change-Id: I777300db65e232ce2d093f580912662468ae17ab
(cherry picked from commit fcf4a8ad4210b140e6cfa8962f8eb71c489e4eb0)
---
M MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
M MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/Spinner.js
2 files changed, 9 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MwEmbedSupport
refs/changes/46/256446/1
diff --git a/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
b/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
index efc4060..75d577d 100644
--- a/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
+++ b/MwEmbedModules/MwEmbedSupport/MwEmbedSupport.php
@@ -17,6 +17,7 @@
),
"Spinner" => array(
'scripts' => 'jquery.loadingSpinner/Spinner.js',
+ 'dependencies' => array( 'mediawiki.util' ),
),
'iScroll' => array(
'scripts' => 'iscroll/src/iscroll.js',
diff --git a/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/Spinner.js
b/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/Spinner.js
index 6544415..5b8fa78 100644
--- a/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/Spinner.js
+++ b/MwEmbedModules/MwEmbedSupport/jquery.loadingSpinner/Spinner.js
@@ -34,23 +34,6 @@
}
/**
- * Insert a new stylesheet to hold the
- *
- * @keyframe or VML rules.
- */
- // ins(document.getElementsByTagName('head')[0], createEl('style'));
- // var sheet = document.styleSheets[document.styleSheets.length-1];
- var sheet = (function() {
- var style = document.createElement('style');
- style['title'] = 'spinjs';
- document.getElementsByTagName('head')[0].appendChild(style);
- if (!window.createPopup) { /* For Safari */
- style.appendChild(document.createTextNode(''));
- }
- return document.styleSheets[document.styleSheets.length - 1];
- })();
-
- /**
* Creates an opacity keyframe animation rule and returns its name.
Since
* most mobile Webkits have timing issues with animation-delay, we
create
* separate rules for each line/segment.
@@ -63,11 +46,11 @@
&& '-' + prefix + '-' || '';
if (!animations[name]) {
- sheet.insertRule('@' + pre + 'keyframes ' + name + '{'
+ mw.util.addCSS('@' + pre + 'keyframes ' + name + '{'
+ '0%{opacity:' + z + '}' + start +
'%{opacity:' + alpha
+ '}' + (start + 0.01) + '%{opacity:1}'
+ (start + trail)
% 100 + '%{opacity:' + alpha + '}' +
'100%{opacity:' + z
- + '}' + '}', 0);
+ + '}' + '}');
animations[name] = 1;
}
return name;
@@ -233,9 +216,11 @@
if (!vendor(s, 'transform') && s.adj) {
// VML support detected. Insert CSS rules ...
- for (i = 4; i--;)
- sheet.addRule([ 'group', 'roundrect', 'fill',
'stroke' ][i],
- 'behavior:url(#default#VML)');
+ for (i = 4; i--;) {
+ mw.util.addCSS( [ 'group', 'roundrect', 'fill',
'stroke' ][i] + ' {'
+ + 'behavior:url(#default#VML)'
+ + '}' );
+ }
proto.lines = function(el, o) {
var r = o.length + o.width, s = 2 * r;
@@ -300,4 +285,4 @@
window.Spinner = Spinner;
-})(window, document);
\ No newline at end of file
+})(window, document);
--
To view, visit https://gerrit.wikimedia.org/r/256446
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I777300db65e232ce2d093f580912662468ae17ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MwEmbedSupport
Gerrit-Branch: wmf/1.27.0-wmf.7
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: TheDJ <hartman.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
