Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329655 )
Change subject: Improved RL loading of timeline JS
......................................................................
Improved RL loading of timeline JS
Change-Id: I033054d2c8519a6b7b6e6e91168c62ae231ced35
---
M Cargo.php
M extension.json
M libs/ext.cargo.timeline.js
3 files changed, 27 insertions(+), 15 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Cargo.php b/Cargo.php
index eccc8e9..50f1943 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -222,6 +222,17 @@
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
),
+ 'ext.cargo.timelinebase' => array(
+ 'scripts' => array(
+ 'libs/ext.cargo.timeline.js',
+ 'libs/SimileTimeline/scripts/timeline.js',
+ 'libs/SimileTimeline/scripts/util/platform.js',
+ 'libs/SimileTimeline/scripts/util/xmlhttp.js',
+ 'libs/SimileTimeline/scripts/util/data-structure.js',
+ 'libs/SimileTimeline/scripts/units.js',
+ 'libs/SimileTimeline/scripts/sources.js',
+ )
+ ),
'ext.cargo.timeline' => array(
'styles' => array(
'libs/SimileTimeline/styles/timeline.css',
@@ -229,25 +240,19 @@
'libs/SimileTimeline/styles/events.css',
),
'scripts' => array(
- 'libs/ext.cargo.timeline.js',
- 'libs/SimileTimeline/scripts/timeline.js',
- 'libs/SimileTimeline/scripts/util/platform.js',
'libs/SimileTimeline/scripts/util/debug.js',
- 'libs/SimileTimeline/scripts/util/xmlhttp.js',
'libs/SimileTimeline/scripts/util/dom.js',
'libs/SimileTimeline/scripts/util/graphics.js',
'libs/SimileTimeline/scripts/util/date-time.js',
- 'libs/SimileTimeline/scripts/util/data-structure.js',
- 'libs/SimileTimeline/scripts/units.js',
'libs/SimileTimeline/scripts/themes.js',
'libs/SimileTimeline/scripts/ethers.js',
'libs/SimileTimeline/scripts/ether-painters.js',
'libs/SimileTimeline/scripts/labellers.js',
- 'libs/SimileTimeline/scripts/sources.js',
'libs/SimileTimeline/scripts/layouts.js',
'libs/SimileTimeline/scripts/painters.js',
'libs/SimileTimeline/scripts/decorators.js',
),
+ 'dependencies' => 'timelinebase',
'position' => 'top',
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
diff --git a/extension.json b/extension.json
index e59f32a..58994da 100755
--- a/extension.json
+++ b/extension.json
@@ -159,6 +159,17 @@
],
"position": "top"
},
+ "ext.cargo.timelinebase": {
+ "scripts": [
+ "libs/ext.cargo.timeline.js",
+ "libs/SimileTimeline/scripts/timeline.js",
+ "libs/SimileTimeline/scripts/util/platform.js",
+ "libs/SimileTimeline/scripts/util/xmlhttp.js",
+
"libs/SimileTimeline/scripts/util/data-structure.js",
+ "libs/SimileTimeline/scripts/units.js",
+ "libs/SimileTimeline/scripts/sources.js"
+ ]
+ },
"ext.cargo.timeline": {
"styles": [
"libs/SimileTimeline/styles/timeline.css",
@@ -166,25 +177,21 @@
"libs/SimileTimeline/styles/events.css"
],
"scripts": [
- "libs/ext.cargo.timeline.js",
- "libs/SimileTimeline/scripts/timeline.js",
- "libs/SimileTimeline/scripts/util/platform.js",
"libs/SimileTimeline/scripts/util/debug.js",
- "libs/SimileTimeline/scripts/util/xmlhttp.js",
"libs/SimileTimeline/scripts/util/dom.js",
"libs/SimileTimeline/scripts/util/graphics.js",
"libs/SimileTimeline/scripts/util/date-time.js",
-
"libs/SimileTimeline/scripts/util/data-structure.js",
- "libs/SimileTimeline/scripts/units.js",
"libs/SimileTimeline/scripts/themes.js",
"libs/SimileTimeline/scripts/ethers.js",
"libs/SimileTimeline/scripts/ether-painters.js",
"libs/SimileTimeline/scripts/labellers.js",
- "libs/SimileTimeline/scripts/sources.js",
"libs/SimileTimeline/scripts/layouts.js",
"libs/SimileTimeline/scripts/painters.js",
"libs/SimileTimeline/scripts/decorators.js"
],
+ "dependencies": [
+ "ext.cargo.timelinebase"
+ ],
"position": "top"
},
"ext.cargo.datatables": {
diff --git a/libs/ext.cargo.timeline.js b/libs/ext.cargo.timeline.js
index 6aee7ac..b74bc7d 100644
--- a/libs/ext.cargo.timeline.js
+++ b/libs/ext.cargo.timeline.js
@@ -1,7 +1,7 @@
// Do some necessary initializion - these lines are copied from
// SimileTimeline's timeline-api.js, which is otherwise unneeded.
-var Timeline = new Object();
+Timeline = new Object();
Timeline.Platform = new Object();
Timeline.urlPrefix = mw.config.get( 'wgScriptPath') +
"/extensions/Cargo/libs/SimileTimeline/";
--
To view, visit https://gerrit.wikimedia.org/r/329655
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I033054d2c8519a6b7b6e6e91168c62ae231ced35
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
