Comparing version 3.11.2 to 3.11.3
@@ -28,3 +28,3 @@ { | ||
"jquery-1.9.1": "jquery#1.9.1", | ||
"qunit": "~1.14.0", | ||
"qunit": "1.x", | ||
"requirejs-text": "2.x", | ||
@@ -31,0 +31,0 @@ "underscore": "1.x", |
@@ -22,2 +22,3 @@ // This file has been created by the `commonjs` Grunt task. You can require() this file in a CommonJS environment. | ||
require('../../js/repeater-thumbnail'); | ||
require('../../js/scheduler'); | ||
require('../../js/scheduler'); | ||
require('../../js/picker'); |
@@ -22,3 +22,4 @@ module.exports = function (grunt) { | ||
'js/repeater-thumbnail.js', | ||
'js/scheduler.js' | ||
'js/scheduler.js', | ||
'js/picker.js' | ||
], | ||
@@ -38,3 +39,3 @@ dest: 'dist/js/' + '<%= pkg.name %>' + '.js' | ||
} | ||
}; |
module.exports = function (grunt) { | ||
var semver = require('semver'); | ||
var packageVersion = require('../../package.json').version; | ||
function getPackageVersion() { | ||
return grunt.file.readJSON('./package.json').version; | ||
} | ||
@@ -19,4 +21,4 @@ return { | ||
{ | ||
// Assumption is made that you are releasing the code within a "release branch" currently | ||
// on the upstream remote repo. This branch will be tracked locally and be used to run | ||
// Assumption is made that you are releasing the code within a "release branch" currently | ||
// on the upstream remote repo. This branch will be tracked locally and be used to run | ||
// the build process in. It will be named release_{BUILD_VERSION}_{MMSS} (that is, it will | ||
@@ -28,3 +30,3 @@ // use the version specified earlier and a "mini-timestamp" of the current hour and minute). | ||
message: function() { | ||
return 'What remote branch from ' + grunt.config('release.remoteRepository') + | ||
return 'What remote branch from ' + grunt.config('release.remoteRepository') + | ||
' would like to build your release based on?'; | ||
@@ -47,11 +49,11 @@ } | ||
value: 'patch', | ||
name: 'Patch: ' + semver.inc(packageVersion, 'patch') + ' Backwards-compatible bug fixes.' | ||
name: 'Patch: ' + semver.inc(getPackageVersion(), 'patch') + ' Backwards-compatible bug fixes.' | ||
}, | ||
{ | ||
value: 'minor', | ||
name: 'Minor: ' + semver.inc(packageVersion, 'minor') + ' Add functionality in a backwards-compatible manner.' | ||
name: 'Minor: ' + semver.inc(getPackageVersion(), 'minor') + ' Add functionality in a backwards-compatible manner.' | ||
}, | ||
{ | ||
value: 'major', | ||
name: 'Major: ' + semver.inc(packageVersion, 'major') + ' Incompatible API changes.' | ||
name: 'Major: ' + semver.inc(getPackageVersion(), 'major') + ' Incompatible API changes.' | ||
}, | ||
@@ -86,3 +88,3 @@ { | ||
type: 'confirm', | ||
message: 'Please review your files. Would you like to commit?' | ||
message: 'Please review your files.\n Check dist files visually to make sure comment banners have correct release version listed, and that *.min files are minified as expected.\n Also confirm that version number is updated in package.json.\n\n Would you like to commit?' | ||
} | ||
@@ -104,3 +106,3 @@ ], | ||
type: 'confirm', | ||
message: 'Would you like to tag as ' + packageVersion + '?' | ||
message: 'Would you like to tag as ' + getPackageVersion() + '?' | ||
} | ||
@@ -123,3 +125,3 @@ ], | ||
message: function() { | ||
return 'What upstream branch would you like to push ' + grunt.config('release.localBranch') + | ||
return 'What upstream branch would you like to push ' + grunt.config('release.localBranch') + | ||
' to (probably ' + grunt.config('release.remoteDestinationBranch') + ')? (leave blank to skip)'; | ||
@@ -143,3 +145,3 @@ } | ||
type: 'confirm', | ||
message: 'Would you like to push tag ' + packageVersion + ' to upstream?' | ||
message: 'Would you like to push tag ' + getPackageVersion() + ' to upstream?' | ||
} | ||
@@ -146,0 +148,0 @@ ], |
@@ -59,3 +59,3 @@ module.exports = function (grunt) { | ||
command: function() { | ||
var command = 'git push ' + grunt.config('release.remoteRepository') + ' ' + packageVersion; | ||
var command = 'git push ' + grunt.config('release.remoteRepository') + ' ' + getPackage().version; | ||
grunt.log.write('Publishing tag: ' + command); | ||
@@ -76,4 +76,2 @@ return command; | ||
var packageVersion = '3.11.2'; | ||
function createUploadCommand(version) { | ||
@@ -87,5 +85,5 @@ return ['mv dist ' + version, | ||
var command = [ | ||
packageVersion, | ||
semver.major(packageVersion) + '.' + semver.minor(packageVersion), | ||
semver.major(packageVersion) | ||
getPackage().version, | ||
semver.major(getPackage().version) + '.' + semver.minor(getPackage().version), | ||
semver.major(getPackage().version) | ||
].map(createUploadCommand).join(' && '); | ||
@@ -92,0 +90,0 @@ grunt.log.write('Uploading: ' + command); |
58
index.js
@@ -15,4 +15,4 @@ define(function (require) { | ||
// programmatically injecting this is so much easier than writing the html by hand 376 times... | ||
$('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id], dt[id]').each(function (i) { | ||
$(this).prepend(['<a class="header-anchor" href="#', this.id, '"><small><span class="glyphicon glyphicon-link"></span></a></small> '].join('')); | ||
$('h1[id], h2[id], h3[id], h4[id], h5[id], h6[id], dt[id], section[id]').each(function (i) { | ||
$(this).children('h2:first').prepend(['<a class="header-anchor" href="#', this.id, '"><small><span class="glyphicon glyphicon-link"></span></a></small> '].join('')); | ||
}); | ||
@@ -949,3 +949,2 @@ | ||
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
@@ -955,4 +954,3 @@ TREE | ||
$('#myTree1').tree({ | ||
dataSource: function (parentData, callback) { | ||
var treeDataSource = function (parentData, callback) { | ||
log("Opening branch data: ", parentData); | ||
@@ -1024,3 +1022,6 @@ | ||
}, 400); | ||
}, | ||
} | ||
$('#myTree1').tree({ | ||
dataSource: treeDataSource, | ||
cacheItems: true, | ||
@@ -1233,3 +1234,48 @@ folderSelect: true, | ||
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
SUPERPICKER | ||
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ | ||
$('#btnPickerEnable').click(function () { | ||
$('#mypicker').picker('enable'); | ||
}); | ||
$('#btnPickerDisable').click(function () { | ||
$('#mypicker').picker('disable'); | ||
}); | ||
$('#btnPickerDestroy').click(function () { | ||
var $container = $('#mypicker').parent(); | ||
var markup = $('#mypicker').picker('destroy'); | ||
log(markup); | ||
$container.append(markup); | ||
$('#mypicker').picker({ | ||
edit: true | ||
}); | ||
}); | ||
$('#mypicker').on('accepted.fu.picker', function() { | ||
console.log('accepted.fu.picker'); | ||
}); | ||
$('#mypicker').on('cancelled.fu.picker', function() { | ||
console.log('cancelled.fu.picker'); | ||
}); | ||
$('#mypicker').on('exited.fu.picker', function() { | ||
console.log('exited.fu.picker'); | ||
}); | ||
$('#mypicker').on('shown.fu.picker', function() { | ||
console.log('shown.fu.picker'); | ||
}); | ||
$('#myPickerTree1').tree({ | ||
dataSource: treeDataSource, | ||
cacheItems: true, | ||
folderSelect: true, | ||
multiSelect: true | ||
}); | ||
// requires https://github.com/exacttarget/get-list-item-path | ||
// $('#mypicker2').on('accepted.fu.picker', function(o){ | ||
// var selected = $('#myPickerTree1').find('.tree-selected'); | ||
// var selectedPaths = getListItemPaths('#myPickerTree1', selected, '.tree-label', '/', ', '); | ||
// $('#mypicker2').picker('setValue', selectedPaths); | ||
// }); | ||
/* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | ||
@@ -1236,0 +1282,0 @@ WIZARD |
@@ -42,2 +42,3 @@ /* | ||
require('fuelux/selectlist'); | ||
require('fuelux/picker'); | ||
require('fuelux/tree'); | ||
@@ -44,0 +45,0 @@ require('fuelux/wizard'); |
@@ -245,3 +245,3 @@ /* | ||
if (!suppressEllipsis && !_isShown) { | ||
if (!suppressEllipsis && !_isShown(this)) { | ||
this.applyEllipsis(); | ||
@@ -248,0 +248,0 @@ } |
@@ -86,3 +86,3 @@ { | ||
"title": "Fuel UX", | ||
"version": "3.11.2", | ||
"version": "3.11.3", | ||
"volo": { | ||
@@ -89,0 +89,0 @@ "baseDir": "lib", |
@@ -9,3 +9,3 @@ /*global QUnit:false, module:false, test:false, asyncTest:false, expect:false*/ | ||
QUnit.start(); // starting qunit, or phantom js will have a problem | ||
// Needed for saucelab testing | ||
@@ -62,2 +62,3 @@ var log = []; | ||
require('./test/spinbox-test'); | ||
require('./test/picker-test'); | ||
require('./test/tree-test'); | ||
@@ -64,0 +65,0 @@ require('./test/wizard-test'); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1807017
197
24275