Permalink
Browse files

(GH1891) updates to qunit 2

  • Loading branch information...
1 parent cb658b4 commit 8f9ce993d51489f636bfe71eb3bd981b7a34c369 @cormacmccarthy cormacmccarthy committed Oct 31, 2016
View
@@ -1,6 +1,6 @@
-/*jshint expr:true*/
-/*global module:false, process:false*/
-module.exports = function (grunt) {
+/* jshint expr:true*/
+/* global module:false, process:false*/
+module.exports = function gruntFile (grunt) {
'use strict';
/*
@@ -16,14 +16,14 @@ module.exports = function (grunt) {
}
// use --no-livereload to disable livereload. Helpful to 'serve' multiple projects
- var isLivereloadEnabled = (typeof grunt.option('livereload') !== 'undefined') ? grunt.option('livereload') : true;
+ // var isLivereloadEnabled = (typeof grunt.option('livereload') !== 'undefined') ? grunt.option('livereload') : true;
// external libraries
- var semver = require('semver');
- var packageVersion = getPackage().version;
- var fs = require('fs');
+ // var semver = require('semver');
+ // var packageVersion = getPackage().version;
+ // var fs = require('fs');
var path = require('path');
- var commonJSBundledReferenceModule = require('./grunt/other/commonjs-reference-module.js');
+ // var commonJSBundledReferenceModule = require('./grunt/other/commonjs-reference-module.js');
// variables used in shared variables below
var connectTestServerOptionsPort = 9000;
@@ -57,22 +57,19 @@ module.exports = function (grunt) {
cdnLoginFile: grunt.file.exists('FUEL_CDN.yml') ? grunt.file.readYAML('FUEL_CDN.yml') : undefined,
sauceUser: process.env.SAUCE_USERNAME || 'fuelux',
// TEST URLS
- allTestUrls: ['2.1.0', '1.11.0', '1.9.1', 'browserGlobals', 'noMoment', 'codeCoverage' ].map(function (type) {
+ allTestUrls: ['2.1.0', '1.11.0', '1.9.1', 'browserGlobals', 'noMoment', 'codeCoverage' ].map(function allTestUrls (type) {
if (type === 'browserGlobals') {
return 'http://localhost:' + connectTestServerOptionsPort + '/test/browser-globals.html';
- }
- else if (type === 'codeCoverage') {
+ } else if (type === 'codeCoverage') {
return 'http://localhost:' + connectTestServerOptionsPort + '/test/?coverage=true';
- }
- else if (type === 'noMoment') {
+ } else if (type === 'noMoment') {
return 'http://localhost:' + connectTestServerOptionsPort + '/test/?no-moment=true';
}
- else {
- // test dist with multiple jQuery versions
- return 'http://localhost:' + connectTestServerOptionsPort + '/test/?testdist=true';
- }
+
+ // test dist with multiple jQuery versions
+ return 'http://localhost:' + connectTestServerOptionsPort + '/test/?testdist=true';
}),
- connectTestServerOptionsPort: connectTestServerOptionsPort,
+ connectTestServerOptionsPort: connectTestServerOptionsPort
}
});
@@ -81,5 +78,4 @@ module.exports = function (grunt) {
// load custom build, release, serve, and test tasks from the folder specified
grunt.loadTasks('./grunt/tasks');
-
-};
+};
View
@@ -25,7 +25,7 @@
"devDependencies": {
"jquery": null,
"jquery-1.9.1": "jquery#1.9.1",
- "qunit": "1.x",
+ "qunit": "2.x",
"requirejs-text": "2.x",
"underscore": "1.x",
"blanket": "1.x",
View
@@ -1,5 +1,6 @@
/*!
- * Fuel UX v3.15.8
+ * Fuel UX EDGE - Built 2016/10/28, 5:23:06 PM
+ * Previous release: v3.15.8
* Copyright 2012-2016 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
@@ -1173,56 +1174,7 @@ label.fuelux .checkbox-inline {
font-size: 64px;
position: relative;
width: 64px;
-}
-.fuelux .loader:after,
-.fuelux .loader:before {
- font-family: "fuelux" !important;
- font-style: normal !important;
- font-weight: normal !important;
- font-variant: normal !important;
- text-transform: none !important;
- line-height: 1;
- speak: none;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- bottom: 0;
- display: block;
- left: 0;
- position: absolute;
- right: 0;
- top: 0;
-}
-.fuelux .loader:before {
- content: '\e000';
- opacity: 0.33;
-}
-.fuelux .loader.iefix:before {
- color: #bbbbbb;
- opacity: 1;
-}
-.fuelux .loader[data-frame="1"]:after {
- content: '\e001';
-}
-.fuelux .loader[data-frame="2"]:after {
- content: '\e002';
-}
-.fuelux .loader[data-frame="3"]:after {
- content: '\e003';
-}
-.fuelux .loader[data-frame="4"]:after {
- content: '\e004';
-}
-.fuelux .loader[data-frame="5"]:after {
- content: '\e005';
-}
-.fuelux .loader[data-frame="6"]:after {
- content: '\e006';
-}
-.fuelux .loader[data-frame="7"]:after {
- content: '\e007';
-}
-.fuelux .loader[data-frame="8"]:after {
- content: '\e008';
+ background-image: url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNjRweCIgaGVpZ2h0PSI2NHB4IiB2aWV3Qm94PSIwIDAgNjQgNjQiIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+PGcgd2lkdGg9IjU0cHgiIGhlaWdodD0iNTRweCIgdmlld0JveD0iNSA1IDU0IDU0IiBpZD0ibG9hZGVyIiBzdHJva2U9Im5vbmUiIHN0cm9rZS13aWR0aD0iMSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNS4wMDAwMDAsIDUuMDAwMDAwKSIgZmlsbD0iIzE1ODllZSI+PGcgaWQ9InNwaW5uZXItbWVkaXVtIj48ZyBpZD0iT3ZhbC0zNSI+PGNpcmNsZSBpZD0iVG9wIiBjeD0iMjciIGN5PSI2IiByPSI1Ij48L2NpcmNsZT48Y2lyY2xlIGlkPSJUb3BSaWdodCIgY3g9IjQ4IiBjeT0iMTciIHI9IjUiPjwvY2lyY2xlPjxjaXJjbGUgaWQ9IkJvdHRvbVJpZ2h0IiBjeD0iNDgiIGN5PSIzNiIgcj0iNSI+PC9jaXJjbGU+PGNpcmNsZSBpZD0iQm90dG9tIiBjeD0iMjciIGN5PSI0OCIgcj0iNSI+PC9jaXJjbGU+PGNpcmNsZSBpZD0iQm90dG9tTGVmdCIgY3g9IjYiIGN5PSIzNiIgcj0iNSI+PC9jaXJjbGU+PGNpcmNsZSBpZD0iVG9wTGVmdCIgY3g9IjYiIGN5PSIxNyIgcj0iNSI+PC9jaXJjbGU+PC9nPjwvZz48L2c+PGFuaW1hdGVNb3Rpb24geGxpbms6aHJlZj0iI1RvcCIgcGF0aD0iTSAwIDAgViAtNSBaIiBkdXI9Ii4yNXMiIGJlZ2luPSIwczsgVG9wTGVmdEFuaW0uZW5kIiBpZD0iVG9wQW5pbSIgLz48YW5pbWF0ZU1vdGlvbiB4bGluazpocmVmPSIjVG9wUmlnaHQiIHBhdGg9Ik0gMCAwIEwgNSAtNSBaIiBkdXI9Ii4yNXMiIGJlZ2luPSJUb3BBbmltLmVuZCIgaWQ9IlRvcFJpZ2h0QW5pbSIgLz48YW5pbWF0ZU1vdGlvbiB4bGluazpocmVmPSIjQm90dG9tUmlnaHQiIHBhdGg9Ik0gMCAwIEwgNSA1IFoiIGR1cj0iLjI1cyIgYmVnaW49IlRvcFJpZ2h0QW5pbS5lbmQiIGlkPSJCb3R0b21SaWdodEFuaW0iIC8+PGFuaW1hdGVNb3Rpb24geGxpbms6aHJlZj0iI0JvdHRvbSIgcGF0aD0iTSAwIDAgViA1IFoiIGR1cj0iLjI1cyIgYmVnaW49IkJvdHRvbVJpZ2h0QW5pbS5lbmQiIGlkPSJCb3R0b21BbmltIiAvPjxhbmltYXRlTW90aW9uIHhsaW5rOmhyZWY9IiNCb3R0b21MZWZ0IiBwYXRoPSJNIDAgMCBMIC01IDUgWiIgZHVyPSIuMjVzIiBiZWdpbj0iQm90dG9tQW5pbS5lbmQiIGlkPSJCb3R0b21MZWZ0QW5pbSIgLz48YW5pbWF0ZU1vdGlvbiB4bGluazpocmVmPSIjVG9wTGVmdCIgcGF0aD0iTSAwIDAgTCAtNSAtNSBaIiBkdXI9Ii4yNXMiIGJlZ2luPSJCb3R0b21MZWZ0QW5pbS5lbmQiIGlkPSJUb3BMZWZ0QW5pbSIgLz48L3N2Zz4=");
}
.fuelux .pillbox {
border: 1px solid #bbbbbb;
@@ -2795,6 +2747,20 @@ label.fuelux .checkbox-inline {
font-size: 16px;
cursor: not-allowed;
}
+.fuelux .wizard > ul.steps li > .has-secondary-text,
+.fuelux .wizard > .steps-container > ul.steps li > .has-secondary-text {
+ display: inline;
+}
+.fuelux .wizard > ul.steps li > .has-secondary-text > h4,
+.fuelux .wizard > .steps-container > ul.steps li > .has-secondary-text > h4 {
+ display: inline;
+ font-size: 16px;
+ font-weight: normal;
+}
+.fuelux .wizard > ul.steps li > .has-secondary-text > small,
+.fuelux .wizard > .steps-container > ul.steps li > .has-secondary-text > small {
+ display: none;
+}
.fuelux .wizard > ul.steps li .chevron,
.fuelux .wizard > .steps-container > ul.steps li .chevron {
border: 24px solid transparent;
Oops, something went wrong.
Oops, something went wrong.
View
Binary file not shown.
View
@@ -1,5 +1,6 @@
/*!
- * Fuel UX v3.15.8
+ * Fuel UX EDGE - Built 2016/10/28, 5:23:06 PM
+ * Previous release: v3.15.8
* Copyright 2012-2016 ExactTarget
* Licensed under the BSD-3-Clause license (https://github.com/ExactTarget/fuelux/blob/master/LICENSE)
*/
@@ -1552,31 +1553,13 @@
var Loader = function( element, options ) {
this.$element = $( element );
this.options = $.extend( {}, $.fn.loader.defaults, options );
-
- this.begin = ( this.$element.is( '[data-begin]' ) ) ? parseInt( this.$element.attr( 'data-begin' ), 10 ) : 1;
- this.delay = ( this.$element.is( '[data-delay]' ) ) ? parseFloat( this.$element.attr( 'data-delay' ) ) : 150;
- this.end = ( this.$element.is( '[data-end]' ) ) ? parseInt( this.$element.attr( 'data-end' ), 10 ) : 8;
- this.frame = ( this.$element.is( '[data-frame]' ) ) ? parseInt( this.$element.attr( 'data-frame' ), 10 ) : this.begin;
- this.isIElt9 = false;
- this.timeout = {};
-
- var ieVer = this.msieVersion();
- if ( ieVer !== false && ieVer < 9 ) {
- this.$element.addClass( 'iefix' );
- this.isIElt9 = true;
- }
-
- this.$element.attr( 'data-frame', this.frame + '' );
- this.play();
};
Loader.prototype = {
constructor: Loader,
destroy: function() {
- this.pause();
-
this.$element.remove();
// any external bindings
// [none]
@@ -1586,60 +1569,19 @@
return this.$element[ 0 ].outerHTML;
},
- ieRepaint: function() {
- if ( this.isIElt9 ) {
- this.$element.addClass( 'iefix_repaint' ).removeClass( 'iefix_repaint' );
- }
- },
+ ieRepaint: function() {},
- msieVersion: function() {
- var ua = window.navigator.userAgent;
- var msie = ua.indexOf( 'MSIE ' );
- if ( msie > 0 ) {
- return parseInt( ua.substring( msie + 5, ua.indexOf( ".", msie ) ), 10 );
- } else {
- return false;
- }
- },
+ msieVersion: function() {},
- next: function() {
- this.frame++;
- if ( this.frame > this.end ) {
- this.frame = this.begin;
- }
+ next: function() {},
- this.$element.attr( 'data-frame', this.frame + '' );
- this.ieRepaint();
- },
+ pause: function() {},
- pause: function() {
- clearTimeout( this.timeout );
- },
+ play: function() {},
- play: function() {
- var self = this;
- clearTimeout( this.timeout );
- this.timeout = setTimeout( function() {
- self.next();
- self.play();
- }, this.delay );
- },
-
- previous: function() {
- this.frame--;
- if ( this.frame < this.begin ) {
- this.frame = this.end;
- }
+ previous: function() {},
- this.$element.attr( 'data-frame', this.frame + '' );
- this.ieRepaint();
- },
-
- reset: function() {
- this.frame = this.begin;
- this.$element.attr( 'data-frame', this.frame + '' );
- this.ieRepaint();
- }
+ reset: function() {}
};
// LOADER PLUGIN DEFINITION
@@ -3840,8 +3782,6 @@
// WIZARD CONSTRUCTOR AND PROTOTYPE
var Wizard = function( element, options ) {
- var kids;
-
this.$element = $( element );
this.options = $.extend( {}, $.fn.wizard.defaults, options );
this.options.disablePreviousStep = ( this.$element.attr( 'data-restrict' ) === 'previous' ) ? true : this.options.disablePreviousStep;
@@ -3850,22 +3790,25 @@
this.$prevBtn = this.$element.find( 'button.btn-prev' );
this.$nextBtn = this.$element.find( 'button.btn-next' );
+ var kids = this.$nextBtn.children().detach();
+ this.nextText = $.trim( this.$nextBtn.text() );
+ this.$nextBtn.append( kids );
+
+ var steps = this.$element.children( '.steps-container' );
// maintains backwards compatibility with < 3.8, will be removed in the future
- if ( this.$element.children( '.steps-container' ).length === 0 ) {
+ if ( steps.length === 0 ) {
+ steps = this.$element;
this.$element.addClass( 'no-steps-container' );
if ( window && window.console && window.console.warn ) {
window.console.warn( 'please update your wizard markup to include ".steps-container" as seen in http://getfuelux.com/javascript.html#wizard-usage-markup' );
}
}
-
- kids = this.$nextBtn.children().detach();
- this.nextText = $.trim( this.$nextBtn.text() );
- this.$nextBtn.append( kids );
+ steps = steps.find( '.steps' );
// handle events
this.$prevBtn.on( 'click.fu.wizard', $.proxy( this.previous, this ) );
this.$nextBtn.on( 'click.fu.wizard', $.proxy( this.next, this ) );
- this.$element.on( 'click.fu.wizard', 'li.complete', $.proxy( this.stepclicked, this ) );
+ steps.on( 'click.fu.wizard', 'li.complete', $.proxy( this.stepclicked, this ) );
this.selectedItem( this.options.selectedItem );
View
Oops, something went wrong.
View
@@ -21,4 +21,4 @@ require('../../js/repeater');
require('../../js/repeater-list');
require('../../js/repeater-thumbnail');
require('../../js/scheduler');
-require('../../js/picker');
+require('../../js/picker');
@@ -2,7 +2,7 @@
<div class="steps-container">
<ul class="steps">
{{#each steps}}
- <li data-step="{{step}}" class="{{#if active}}active{{/if}}{{#if complete}}complete{{/if}}"><span class="badge">{{stepBadge}}</span>{{stepLabel}}<span class="chevron"></span></li>
+ <li data-step="{{step}}" class="{{#if active}}active{{/if}}{{#if complete}}complete{{/if}}"><span class="badge">{{stepBadge}}</span>{{#if secondaryText}}<div class="has-secondary-text"><h4>{{/if}}{{stepLabel}}{{#if secondaryText}}</h4><small>{{secondaryText}}</small></div>{{/if}}<span class="chevron"></span></li>
{{/each}}
</ul>
</div>
@@ -1,13 +0,0 @@
-module.exports = function (grunt) {
-
- return {
- source: {
- options: {
- urls: ['http://localhost:' + '<%= connectTestServerOptionsPort %>' + '/test/?coverage=true&gruntReport'],
- threshold: 1,
- globalThreshold: 1
- }
- }
- }
-
-};
@@ -4,4 +4,4 @@ module.exports = {
'test/commonjs-bundle.js': ['test/commonjs-test.js']
}
}
-};
+};
@@ -10,4 +10,4 @@ module.exports = {
mode: 'zip'
}
}
-};
+};
@@ -1,5 +1,4 @@
-module.exports = function (grunt) {
-
+module.exports = function qunit (grunt) {
return {
release: {
options: {
@@ -35,6 +34,5 @@ module.exports = function (grunt) {
]
}
}
- }
-
-};
+ };
+};
View
@@ -1,7 +1,7 @@
module.exports = function test (grunt) {
// to be run prior to submitting a PR
grunt.registerTask('test', 'run jshint, qunit source w/ coverage, and validate HTML',
- ['jshint', 'connect:testServer', 'blanket_qunit:source', 'qunit:noMoment', 'qunit:globals', 'htmllint']);
+ ['jshint', 'connect:testServer', 'qunit:noMoment', 'qunit:globals', 'qunit:dist', 'htmllint']);
// If qunit:source is working but qunit:full is breaking, check to see if the dist broke the code. This would be especially useful if we start mangling our code, but, is 99.99% unlikely right now
grunt.registerTask('validate-dist', 'run qunit:source, dist, and then qunit:full',
Oops, something went wrong.

0 comments on commit 8f9ce99

Please sign in to comment.