Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222529
Change subject: Make demos self-contained in demos/ directory
......................................................................
Make demos self-contained in demos/ directory
After running "npm demos", everything needed to display the demos is in
the demos/ folder.
Change-Id: Ieac91b23751e086e036f746ad7d4830b4aa32c44
---
M .gitignore
M Gruntfile.js
M demos/demo.js
M demos/index.html
M demos/widgets.php
M package.json
6 files changed, 31 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/29/222529/1
diff --git a/.gitignore b/.gitignore
index 7f4bdf0..bab5022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,8 @@
tests/JSPHP.test.js
vendor
composer.lock
+/demos/composer.json
+/demos/node_modules
+/demos/dist
+/demos/php
+
diff --git a/Gruntfile.js b/Gruntfile.js
index d112fee..2f40c42 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -239,6 +239,11 @@
src: '{dist,node_modules/{' + Object.keys(
pgk.dependencies ).join( ',' ) + '}}/**/*',
dest: 'docs/',
expand: true
+ },
+ demos: {
+ src:
'{node_modules/{jquery/dist/jquery.js,oojs/dist/oojs.jquery.js},composer.json,dist/**/*,php/**/*}',
+ dest: 'demos/',
+ expand: true
}
},
colorizeSvg: colorizeSvgFiles,
@@ -309,6 +314,10 @@
},
phpGenerateJSPHPForKarma: {
command: 'composer update && php
bin/generate-JSPHP-for-karma.php > tests/JSPHP.test.js'
+ },
+ demos: {
+ command: 'composer update --no-dev',
+ cwd: 'demos'
}
},
karma: {
@@ -402,6 +411,7 @@
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint',
'banana' ] );
grunt.registerTask( 'test', [ 'lint', 'pre-test', 'git-build',
'karma:main', 'karma:other' ] );
+ grunt.registerTask( 'demos', [ 'copy:demos', 'exec:demos' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/demos/demo.js b/demos/demo.js
index 9e67c99..018bcf2 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -337,9 +337,9 @@
} );
// Theme styles
- urls.push( '../dist/oojs-ui' + fragments.slice( 1 ).join( '' ) + '.css'
);
+ urls.push( 'dist/oojs-ui' + fragments.slice( 1 ).join( '' ) + '.css' );
for ( i = 0, len = suffixes.length; i < len; i++ ) {
- urls.push( '../dist/oojs-ui' + fragments[1] + suffixes[i] +
fragments.slice( 2 ).join( '' ) + '.css' );
+ urls.push( 'dist/oojs-ui' + fragments[1] + suffixes[i] +
fragments.slice( 2 ).join( '' ) + '.css' );
}
// Demo styles
diff --git a/demos/index.html b/demos/index.html
index 35ccc69..93c8a86 100644
--- a/demos/index.html
+++ b/demos/index.html
@@ -7,11 +7,11 @@
<meta name="viewport" content="width=device-width, user-scalable=no">
</head>
<body>
- <script src="../node_modules/jquery/dist/jquery.js"></script>
- <script src="../node_modules/oojs/dist/oojs.jquery.js"></script>
- <script src="../dist/oojs-ui.js"></script>
- <script src="../dist/oojs-ui-apex.js"></script>
- <script src="../dist/oojs-ui-mediawiki.js"></script>
+ <script src="node_modules/jquery/dist/jquery.js"></script>
+ <script src="node_modules/oojs/dist/oojs.jquery.js"></script>
+ <script src="dist/oojs-ui.js"></script>
+ <script src="dist/oojs-ui-apex.js"></script>
+ <script src="dist/oojs-ui-mediawiki.js"></script>
<script src="demo.js"></script>
<script src="pages/dialogs.js"></script>
<script src="pages/icons.js"></script>
diff --git a/demos/widgets.php b/demos/widgets.php
index f512827..d4adbaa 100644
--- a/demos/widgets.php
+++ b/demos/widgets.php
@@ -1,5 +1,5 @@
<?php
- $autoload = '../vendor/autoload.php';
+ $autoload = __DIR__ . '/vendor/autoload.php';
if ( !file_exists( $autoload ) ) {
echo '<h1>Did you forget to run <code>composer
install</code>?</h1>';
exit();
@@ -35,7 +35,7 @@
<head>
<meta charset="UTF-8">
<title>OOjs UI Widget Demo</title>
- <link rel="stylesheet" href="../dist/<?php echo $styleFileName; ?>">
+ <link rel="stylesheet" href="dist/<?php echo $styleFileName; ?>">
<link rel="stylesheet" href="styles/demo<?php echo $directionSuffix;
?>.css">
</head>
<body class="oo-ui-<?php echo $direction; ?>">
@@ -916,10 +916,10 @@
</div>
<!-- Demonstrate JavaScript "infusion" of PHP widgets -->
- <script src="../node_modules/jquery/dist/jquery.js"></script>
- <script src="../node_modules/oojs/dist/oojs.jquery.js"></script>
- <script src="../dist/oojs-ui.js"></script>
- <script src="../dist/oojs-ui-<?php echo $theme; ?>.js"></script>
- <script src="./infusion.js"></script>
+ <script src="node_modules/jquery/dist/jquery.js"></script>
+ <script src="node_modules/oojs/dist/oojs.jquery.js"></script>
+ <script src="dist/oojs-ui.js"></script>
+ <script src="dist/oojs-ui-<?php echo $theme; ?>.js"></script>
+ <script src="infusion.js"></script>
</body>
</html>
diff --git a/package.json b/package.json
index 4ea4c75..439336e 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
"predoc": "grunt build",
"doc": "jsduck",
"postdoc": "grunt copy:jsduck",
- "prepublish": "grunt build"
+ "prepublish": "grunt build",
+ "demos": "grunt demos"
},
"dependencies": {
"jquery": "1.11.3",
--
To view, visit https://gerrit.wikimedia.org/r/222529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieac91b23751e086e036f746ad7d4830b4aa32c44
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
