Skip to content

Template: Fix spelling s/carat/caret #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Template: Fix spelling s/carat/caret #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1cefba
Packer: Function rename (minor fix)
rxaviers Nov 24, 2014
8cc664b
Packer: Add packer-1-12-0
rxaviers Nov 24, 2014
13ff47a
Template: Fix spelling s/carat/caret
rxaviers Nov 12, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/packer-1-11-0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@ pack = function( callback ) {
* - builder [ instanceof Builder ]: jQuery UI builder object.
* - theme [ instanceof ThemeRoller ]: theme object.
*/
function Packer_1_10( builder, theme ) {
function Packer_1_11( builder, theme ) {
this.pack = pack;
}

module.exports = Packer_1_10;
module.exports = Packer_1_11;
133 changes: 133 additions & 0 deletions lib/packer-1-12-0.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
var pack, indexTemplate, stripBanner,
async = require( "async" ),
banner = require( "./banner" ),
Files = require( "./files" ),
fs = require( "fs" ),
handlebars = require( "handlebars" ),
path = require( "path" ),
sqwish = require( "sqwish" ),
util = require( "./util" );

indexTemplate = handlebars.compile( fs.readFileSync( __dirname + "/../template/zip/index-1-12.html", "utf8" ) );

stripBanner = util.stripBanner;

/**
* Generates a build array [ <build-item>, ... ], where
* build-item = {
* path: String:package destination filepath,
* data: String/Buffer:the content itself
* }
*/
pack = function( callback ) {
var build,
add = function( file ) {
if ( arguments.length === 2 ) {
file = {
path: arguments[ 0 ],
data: arguments[ 1 ]
};
}
output.push({
path: path.join( basedir, file.path ),
data: file.data
});
},
basedir = this.basedir,
builder = this.builder,
options = this.options,
output = [],
theme = this.theme,
themeImagesCache = this.themeImagesCache;

function _build( callback ) {
builder.build(function( error, _build ) {
if ( error ) {
return callback( error );
}
build = _build;
callback();
});
}

function pack( callback ) {
// Bundle JS
build.bundleJs.forEach( add );
build.bundleJsMin.forEach( add );

// Theme files
if ( !options.skipTheme ) {
add( "jquery-ui.structure.css", build.structureCss );
add( "jquery-ui.structure.min.css", build.structureCssMin );

if ( !theme.isNull ) {
add( "jquery-ui.theme.css", theme.css() );
add( "jquery-ui.theme.min.css", banner( build.pkg, null, { minify: true } ) + sqwish.minify( util.stripBanner({ data: theme.css() }) ) );
}

// Bundle CSS
build.bundleCss( theme ).forEach( add );
build.bundleCssMin( theme ).forEach( add );
}

// Ad hoc
build.jqueryCore.forEach( add );
add( "index.html", indexTemplate({
ui: build.components.reduce(function( sum, component ) {
sum[ component ] = true;
return sum;
}, {}),
version: build.pkg.version
}));

// Theme image files
if ( theme.isNull ) {
callback( null, output );
}
else {
async.series([
function( callback ) {
var themeImages = Files();
if ( themeImagesCache[ theme.name ] ) {
// Cached
callback( null, themeImages.concat( themeImagesCache[ theme.name ] ) );
} else {
// Not cached, fetch them
theme.generateImages(function( err, imageFiles ) {
if ( err ) {
callback( err, null );
return;
}
callback( null, themeImages.concat( imageFiles ) );
});
}
}
], function( err, themeImages ) {
if ( err ) {
callback( err, null );
}
themeImages[ 0 ].into( "images/" ).forEach( add );
callback( null, output );
});
}
}

async.series([
_build,
pack
], function( error ) {
callback( error, output );
});
};


/**
* Packer( builder, theme, options )
* - builder [ instanceof Builder ]: jQuery UI builder object.
* - theme [ instanceof ThemeRoller ]: theme object.
*/
function Packer_1_12( builder, theme ) {
this.pack = pack;
}

module.exports = Packer_1_12;
4 changes: 3 additions & 1 deletion lib/packer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ function Packer( builder, theme, options ) {
this.theme = theme;
this.themeImagesCache = themeImagesCache;

if ( semver.gte( this.builder.jqueryUi.pkg.version, "1.11.1-a" ) ) {
if ( semver.gte( this.builder.jqueryUi.pkg.version, "1.12.0-a" ) ) {
require( "./packer-1-12-0" ).call( this, builder, theme, options );
} else if ( semver.gte( this.builder.jqueryUi.pkg.version, "1.11.1-a" ) ) {
require( "./packer-1-11-1" ).call( this, builder, theme, options );
} else if ( semver.gte( this.builder.jqueryUi.pkg.version, "1.11.0-a" ) ) {
require( "./packer-1-11-0" ).call( this, builder, theme, options );
Expand Down
20 changes: 10 additions & 10 deletions template/themeroller/comp_group_a.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,17 @@ <h2 class="demoHeaders">Overlay and Shadow Classes</h2>
<h2 class="demoHeaders">Framework Icons (content color preview)</h2>
<ul id="icons" class="ui-widget ui-helper-clearfix">

<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-n"><span class="ui-icon ui-icon-carat-1-n"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-ne"><span class="ui-icon ui-icon-carat-1-ne"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-e"><span class="ui-icon ui-icon-carat-1-e"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-n"><span class="ui-icon ui-icon-caret-1-n"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-ne"><span class="ui-icon ui-icon-caret-1-ne"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-e"><span class="ui-icon ui-icon-caret-1-e"></span></li>

<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-se"><span class="ui-icon ui-icon-carat-1-se"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-s"><span class="ui-icon ui-icon-carat-1-s"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-sw"><span class="ui-icon ui-icon-carat-1-sw"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-w"><span class="ui-icon ui-icon-carat-1-w"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-1-nw"><span class="ui-icon ui-icon-carat-1-nw"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-n-s"><span class="ui-icon ui-icon-carat-2-n-s"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-carat-2-e-w"><span class="ui-icon ui-icon-carat-2-e-w"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-se"><span class="ui-icon ui-icon-caret-1-se"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-s"><span class="ui-icon ui-icon-caret-1-s"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-sw"><span class="ui-icon ui-icon-caret-1-sw"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-w"><span class="ui-icon ui-icon-caret-1-w"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-1-nw"><span class="ui-icon ui-icon-caret-1-nw"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-n-s"><span class="ui-icon ui-icon-caret-2-n-s"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-caret-2-e-w"><span class="ui-icon ui-icon-caret-2-e-w"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-n"><span class="ui-icon ui-icon-triangle-1-n"></span></li>
<li class="ui-state-default ui-corner-all" title=".ui-icon-triangle-1-ne"><span class="ui-icon ui-icon-triangle-1-ne"></span></li>

Expand Down
Loading