jenkins-bot has submitted this change and it was merged.
Change subject: build: Make `quick-build` build the 'mixed' distribution
......................................................................
build: Make `quick-build` build the 'mixed' distribution
Default both the JS and PHP demos back to mixed.
Also warn the unwary user of the build.
Bug: T109958
Change-Id: I8c2e857c3fc997186a2e119115d0bde56488fdbd
---
M Gruntfile.js
M demos/demo.js
M demos/widgets.php
3 files changed, 9 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index fb13fd0..aa7d6a6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -401,6 +401,10 @@
} );
} );
+ grunt.registerTask( 'note-quick-build', function () {
+ grunt.log.warn( 'You have built a no-frills, SVG-only, LTR-only
version for development; some things will be broken.' );
+ } );
+
grunt.registerTask( 'build-code', [ 'concat:js', 'uglify' ] );
grunt.registerTask( 'build-styling', [
'colorizeSvg', 'less', 'cssjanus',
@@ -420,9 +424,10 @@
grunt.registerTask( 'quick-build', [
'pre-git-build', 'clean:build', 'fileExists', 'tyops',
'concat:js',
- 'colorizeSvg', 'less:distVector', 'concat:css',
+ 'colorizeSvg', 'less:distMixed', 'concat:css',
'copy:imagesCommon', 'copy:imagesApex', 'copy:imagesMediaWiki',
- 'build-i18n', 'copy:demos', 'copy:fastcomposerdemos'
+ 'build-i18n', 'copy:demos', 'copy:fastcomposerdemos',
+ 'note-quick-build'
] );
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint',
'banana' ] );
diff --git a/demos/demo.js b/demos/demo.js
index 6883b68..656c0eb 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -199,7 +199,7 @@
* @static
* @property {string}
*/
-OO.ui.Demo.static.defaultGraphics = 'vector';
+OO.ui.Demo.static.defaultGraphics = 'mixed';
/**
* Default page.
diff --git a/demos/widgets.php b/demos/widgets.php
index 247cbf7..07af4a0 100644
--- a/demos/widgets.php
+++ b/demos/widgets.php
@@ -16,7 +16,7 @@
'raster' => '.raster',
);
$graphic = ( isset( $_GET['graphic'] ) && isset( $graphicSuffixMap[
$_GET['graphic'] ] ) )
- ? $_GET['graphic'] : 'vector';
+ ? $_GET['graphic'] : 'mixed';
$graphicSuffix = $graphicSuffixMap[ $graphic ];
$direction = ( isset( $_GET['direction'] ) && $_GET['direction'] ===
'rtl' ) ? 'rtl' : 'ltr';
--
To view, visit https://gerrit.wikimedia.org/r/233167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c2e857c3fc997186a2e119115d0bde56488fdbd
Gerrit-PatchSet: 3
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
