[MediaWiki-commits] [Gerrit] Moves entity spinner to entityViewinit - change (mediawiki...Wikibase)

[Jonas Kress (WMDE) (Code Review)]

Jonas Kress (WMDE) has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/229680

Change subject: Moves entity spinner to entityViewinit
......................................................................

Moves entity spinner to entityViewinit

Moves entity spinner to entityViewinit, because it needs jquery and css
files to be loaded

Bug: T108003
Change-Id: I8abcb099b50108c4665db4d4f5ca2402db16aa91
---
M repo/resources/wikibase.ui.entityViewInit.js
M view/resources/wikibase/wikibase.css
M view/src/EntityView.php
3 files changed, 11 insertions(+), 24 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/80/229680/1

diff --git a/repo/resources/wikibase.ui.entityViewInit.js 
b/repo/resources/wikibase.ui.entityViewInit.js
index 4485033..cdd66b6 100644
--- a/repo/resources/wikibase.ui.entityViewInit.js
+++ b/repo/resources/wikibase.ui.entityViewInit.js
@@ -386,6 +386,15 @@
                );
        }
 
+       //spinner
+       $( '.wikibase-entityview' ).addClass( 'loading' ).append(
+               $( '<div/>' ).addClass( 'mw-small-spinner wb-entity-spinner' )
+       );
+       window.setTimeout( function() {
+               $( '.wikibase-entityview' ).removeClass( 'loading' );
+               $( '.wb-entity-spinner' ).remove();
+       }, 7000 );
+
 } )(
        jQuery,
        mediaWiki,
diff --git a/view/resources/wikibase/wikibase.css 
b/view/resources/wikibase/wikibase.css
index 8c8ffd7..988afd8 100644
--- a/view/resources/wikibase/wikibase.css
+++ b/view/resources/wikibase/wikibase.css
@@ -143,7 +143,7 @@
        position: relative;
 }
 
-.wb-entity.loading > * {
+.wikibase-entityview.loading > * {
        opacity: .3;
 }
 
@@ -153,7 +153,7 @@
        margin-left: -10px; /* half of the 20px width of .mw-small-spinner */
        opacity: 1 !important;
        position: absolute;
-       top: 40px;
+       top: 140px;
 }
 
 .loading .wb-entity-spinner {
diff --git a/view/src/EntityView.php b/view/src/EntityView.php
index 1aa0959..8c0aaf5 100644
--- a/view/src/EntityView.php
+++ b/view/src/EntityView.php
@@ -103,8 +103,6 @@
                        $this->getSideHtml( $entityRevision )
                );
 
-               $html .= $this->getLoadingSpinnerInlineScript();
-
                return $html;
        }
 
@@ -129,26 +127,6 @@
                }
 
                return '';
-       }
-
-       private function getLoadingSpinnerInlineScript() {
-               // Show loading spinner as long as JavaScript is initialising.
-               // The fastest way to show it is placing the script right after 
the corresponding HTML.
-               // Remove it after a while in any case (e.g. some resources 
might not have been loaded
-               // silently, so JavaScript is not initialising).
-               // Additionally attaching to window.error would only make sense 
before any other
-               // JavaScript is parsed.
-               return Html::inlineScript( '
-if ( $ ) {
-       $( ".wikibase-entityview" ).addClass( "loading" ).append(
-               $( "<div/>" ).addClass( "mw-small-spinner wb-entity-spinner" )
-       );
-       window.setTimeout( function() {
-               $( ".wikibase-entityview" ).removeClass( "loading" );
-               $( ".wb-entity-spinner" ).remove();
-       }, 7000 );
-}
-' );
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/229680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8abcb099b50108c4665db4d4f5ca2402db16aa91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits