Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

Bellows 2.0 #28

Merged
merged 141 commits into from
Aug 26, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
8dc7aed
Refactor Bellows to use divs and new classing system
kpeatt Mar 20, 2014
c38d373
Make sure autoprefixer is adding support for old enough versions
kpeatt Mar 20, 2014
00c8b2f
Update readme to match new classing system
kpeatt Mar 21, 2014
79346c2
Add note about IE8 compatability
kpeatt Mar 21, 2014
5b7692c
Add code coloring to the readme
kpeatt Mar 21, 2014
89566f7
Rewrite of bellowsgit add .
Jun 26, 2014
95ef5ff
Changed some stuff
Jun 26, 2014
170e304
Updating grunt-clean to grunt-contrib-clean
Jun 26, 2014
910bbcb
Some fixes for shtuff
Jun 26, 2014
60d975d
Updated readme
Jun 26, 2014
a582297
Updates to allow bellows inside bellows
Jun 26, 2014
e175ec4
Add Sass
kpeatt Jun 26, 2014
4c6c1d7
Committed some bad files
kpeatt Jun 26, 2014
68c3efe
Adding zepto dist
Jun 26, 2014
209e5fb
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jun 26, 2014
4c86b9d
Stop cleaning and switch to having index.html in dist/
kpeatt Jun 26, 2014
7502873
Only copy JS files across and rely on build
kpeatt Jun 26, 2014
af82cee
Moving index to examples folder
Jun 26, 2014
764a792
Better example theme
kpeatt Jun 27, 2014
32cada3
Use bower component for velocity instead of lib
kpeatt Jun 27, 2014
d32a13f
Remove lib version of velocity
kpeatt Jun 27, 2014
cde4f73
Add push down to smooth animation on older devices
kpeatt Jun 28, 2014
399dbee
Moving tasks to external files
Jul 2, 2014
f38a41d
Adding test infrastructure
Jul 3, 2014
49c8523
Refactoring of Gruntfile. Adding test infrastructure
Jul 3, 2014
5f1048d
Refactored a bit of bellows to remove some repetitive code
Jul 3, 2014
97a4440
Removing bower_components and dist directories
Jul 3, 2014
7e8d4b5
Adding some plugin tests
Jul 3, 2014
b504bfb
Adding a few comments for clarification. Adding some tests
Jul 3, 2014
63b9219
Adding tappy. Cleanup of examples
Jul 3, 2014
2c1c0ef
Removing tappy from libs in favor of bower install.
Jul 3, 2014
776fe3b
Removing localConfig.
Jul 3, 2014
763514a
Switch to new state naming methods
kpeatt Jul 3, 2014
f542b20
Update the usage section in the readme
kpeatt Jul 3, 2014
04549e3
Remove extra ```
kpeatt Jul 3, 2014
090df48
Update formatting of readme
kpeatt Jul 3, 2014
13abd7e
Remove unnecessary tabbing in readme
kpeatt Jul 3, 2014
ae13e51
Moving require to use bower component. Moving test HTML into fixture …
Jul 3, 2014
aba0c61
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 3, 2014
e39e784
Fixing broken tests
Jul 3, 2014
4ed0550
Reworking event tests
Jul 3, 2014
9908e9d
Fixing examples
Jul 3, 2014
b859e97
Removing unused class from examples.css
Jul 3, 2014
cf115b4
Adding circle configuration
Jul 3, 2014
59f675c
space
Jul 3, 2014
ac28327
Adding dist directory. Updating gitignore.
Jul 3, 2014
66be95a
Scope animations for accordion pips to children elements
kpeatt Jul 3, 2014
b5f0ef4
Add documentation on easing property to readme
kpeatt Jul 3, 2014
c575db2
Break out each of the examples to their own pages
kpeatt Jul 3, 2014
03cc6b6
Remove reference to zip in readme
kpeatt Jul 3, 2014
a56c14d
Add bower install to our build steps
kpeatt Jul 3, 2014
69c3281
Add Zappy as a requirement
kpeatt Jul 3, 2014
8cd76fb
Adding tests on methods
Jul 3, 2014
f28aca9
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 3, 2014
ca04ec1
Fixing merge conflicts
Jul 3, 2014
ec5ad5d
Requiring in Velocity and shim
Jul 3, 2014
899be41
Add requirements section to the top of the readme
kpeatt Jul 3, 2014
62bd508
Merge branch 'bellows-2.0' of github.com:mobify/bellows into bellows-2.0
kpeatt Jul 3, 2014
dd8e8f1
Fix typo in readme
kpeatt Jul 3, 2014
f8ab5e4
Trying to fix velocity shim
Jul 5, 2014
28180fc
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 5, 2014
ddd1352
Renaming test files so they're more generic
Jul 7, 2014
6dc0dfb
Updating description for bower and package json files
Jul 7, 2014
1df040b
Debugging CI
Jul 7, 2014
d9dcb0c
More test debugging
Jul 7, 2014
db77d15
Removing console.log debug messages
Jul 7, 2014
0541d85
Fixing some require configs
Jul 7, 2014
727992b
Fix animation jank in theme on iOS6
kpeatt Jul 8, 2014
f198c50
Merge branch 'bellows-2.0' of github.com:mobify/bellows into bellows-2.0
kpeatt Jul 8, 2014
bbf8b64
Fix landscape text resizing
kpeatt Jul 8, 2014
ec47f93
Fix Steve missing the ! on his doctype
kpeatt Jul 8, 2014
397dea6
Fix for multiple event queue
Jul 8, 2014
4b86971
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 8, 2014
a233de8
Update theme pip to not be readable and to render better on Android
kpeatt Jul 8, 2014
9009a3a
Fix for #23
Jul 8, 2014
a7e2a70
Update bellows theme
kpeatt Jul 9, 2014
b2e6c2a
Merge branch 'bellows-2.0' of github.com:mobify/bellows into bellows-2.0
kpeatt Jul 9, 2014
03bf06b
Smaller pip in theme
kpeatt Jul 9, 2014
974ee80
Toggle display instead of height — seems smoother
kpeatt Jul 9, 2014
764334c
Use Velocity to get height instead of Zepto
kpeatt Jul 11, 2014
b626ada
Determined closing height animation issue was due to removing class t…
kpeatt Jul 11, 2014
1978eee
Determined closing height animation issue was due to removing class t…
kpeatt Jul 11, 2014
8bb18f4
Somehow managed to balls up that last commit
kpeatt Jul 11, 2014
a75f160
Make class name variables consistent
kpeatt Jul 15, 2014
ddf7115
Update readme to address issues in #25
kpeatt Jul 15, 2014
9ee2637
Continued updates to address #25
kpeatt Jul 15, 2014
3098f97
Making init internal
Jul 15, 2014
5e4452b
Removing toggle event.
Jul 15, 2014
d675736
Refining how plugin behaves when invoking methods on it. Refining beh…
Jul 16, 2014
c68bfd2
Fixing connect so it only runs the server on serve
Jul 16, 2014
c6c11bd
Fixes issue with iOS6 losing taps. Fixes aria attributes
Jul 16, 2014
0ba23cc
Updating readme
Jul 16, 2014
21c9e59
Fixes for #25
scalvert Jul 16, 2014
e211700
Added installation section.
scalvert Jul 16, 2014
f16401c
Changing format of code
scalvert Jul 16, 2014
50cd9c6
Reverting to earlier version of velocity. Needs a bower install
Jul 17, 2014
9113689
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 17, 2014
efbf5be
Updating velocity to 0.8.0
Jul 17, 2014
1216662
Fixing broken tests
Jul 17, 2014
2e13f63
Updating grunt tasks
Jul 17, 2014
2587172
Trying to fix tests
Jul 17, 2014
0c536ac
Trying to fix tests
Jul 17, 2014
be2ffee
Trying to fix tests
Jul 17, 2014
f90a7af
Moved Requirements explanations into the proper section
kpeatt Jul 18, 2014
44ed3e5
Prepare for new version of Velocity
kpeatt Jul 18, 2014
a6a559b
Fix for #20 - adding AMD wrapper
Jul 21, 2014
1a0315c
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 21, 2014
d71c297
Merge branch 'bellows-2.0' of github.com:mobify/bellows into bellows-2.0
kpeatt Jul 21, 2014
f52f166
Renaming selectorLibrary to selectorEngine so it will work out of the…
Jul 21, 2014
a4af13e
Merge
Jul 21, 2014
cc2c6e9
Adding dust and mustache templates for bellows
Jul 22, 2014
b117742
Adding some comments etc to bellows source
Jul 22, 2014
b2884fc
Testing hook to hipchat
Jul 22, 2014
6b431c2
Bumping year in README
scalvert Jul 22, 2014
5c144e9
Updating task for building
Jul 22, 2014
c3e82bd
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 22, 2014
a7bab9b
Fixing watch task
Jul 22, 2014
a8df31f
Updating velocity to latest version
Jul 24, 2014
0395c60
Add build-dist to serve grunt task
kpeatt Jul 24, 2014
98837e5
Clarify what we're doing in the core SCSS file
kpeatt Jul 24, 2014
2df88c5
Reworking the examples to use require.js
Jul 24, 2014
05283b7
Adding some comments to the main.js file in examples
Jul 24, 2014
36fca75
Fixing FOUC during pre-wrapping of content elements
Jul 24, 2014
1f4486d
Adding gremlins tests to RELEASE THE HORDE
Jul 24, 2014
6ae3b4b
Rewrite pip to have A) cooler animation and B) fix #29
kpeatt Jul 24, 2014
5885711
Merge branch 'bellows-2.0' of github.com:mobify/bellows into bellows-2.0
kpeatt Jul 24, 2014
3da0382
Updating gremlins test title. Updated bower.json to ignore all but ne…
Jul 24, 2014
d71bfaa
Merge branch 'bellows-2.0' of https://github.com/mobify/bellows into …
Jul 24, 2014
1112e3b
Simplifying require.js configuration
Jul 31, 2014
40ce028
Upgrading version of Velocity
Aug 12, 2014
7e606a3
Upgrading to latest velocity with AMD module definition
Aug 21, 2014
a38aad5
Renaming require aliases to be more consistent
Aug 21, 2014
8198ffe
Renaming require aliases to be more consistent
Aug 21, 2014
ca74fa0
Fixing up bellows dependencies
Aug 21, 2014
67f6a9e
Fixing animate call
Aug 25, 2014
1cfa92f
Fixing AMD wrapper so that velocity is used as a module param instead…
Aug 26, 2014
d2dc5fb
Bumping velocity version
tedtate Aug 26, 2014
b0514a4
Adding example of bellows usage without require
tedtate Aug 26, 2014
ec9b15f
Adding closeAll method
Aug 26, 2014
f998bbe
Merge
Aug 26, 2014
a63c266
Bring version back to 0.11.7 as .9 is having issues compiling when JQ
tedtate Aug 26, 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
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
.DS_Store
node_modules/
localConfig.json
build/bellows.zip
build/bellows-style.css
build/bellows.css
build/bellows.js
bower_components/
.DS_Store
/.sass-cache/
149 changes: 47 additions & 102 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,110 +1,55 @@
'use strict'

var path = require('path');

module.exports = function(grunt) {
var _ = grunt.util._;

// By default, we load all local tasks from the tasks directory.
grunt.file.expand('tasks/*').forEach(function(task) {
grunt.loadTasks(task);
});

// Populate the config object
var config = {};
grunt.file.expand('tasks/config/*').forEach(function(configPath) {
// Get the grunt-task name to put in the config which is based on the
// name of the config file
var configName = configPath.match(/\/([^\/]*)\.js/)[1];
var option = require(path.join(__dirname + '/' + configPath))(grunt);
config[configName] = _.extend(config[configName] || {}, option);
});

// Project configuration.
grunt.initConfig({
grunt.initConfig(_.extend({
pkg: grunt.file.readJSON('package.json'),
localConfig: (function(){
try {
return grunt.file.readJSON('localConfig.json')
} catch(e) {
return {};
}
})(),
releaseName: '<%= pkg.name %>-<%= pkg.version %>',
releaseMessage: '<%= pkg.name %> release <%= pkg.version %>',
clean: {
buildProducts: "build/"
},
connect: {
server: {
options: {
hostname: '0.0.0.0',
port: 3000,
base: '.'
}
}
},
watch: {
files: ["src/**/*"],
tasks: ['build']
},
copy: {
main: {
files: [
{expand: true, flatten: true, src: ['src/**'], dest: 'build/', filter: 'isFile'}
]
}
},
uglify: {
options: {
banner: '/*! <%= pkg.name %> <%= pkg.version %> <%= grunt.template.today("yyyy-mm-dd") %> */\n'
},
build: {
src: 'src/bellows.js',
dest: 'build/bellows.min.js'
}
},
cssmin: {
core: {
src: 'src/bellows.css',
dest: 'build/bellows.min.css'
},
style: {
src: 'src/bellows-style.css',
dest: 'build/bellows-style.min.css'
}
},
zip: {
"build/bellows.zip": ["src/bellows.js", "src/bellows.css",
"src/bellows-style.css"]
},
s3: {
key: '<%= localConfig.aws.key %>',
secret: '<%= localConfig.aws.secret %>',
bucket: '<%= localConfig.aws.bucket %>',
access: "public-read",
headers: { "Cache-Control": "max-age=1200" },
upload: [
{ // build
src: "build/*",
dest: "modules/bellows/<%= pkg.version %>/",
rel: "build"
}
]
},
release: {
options: {
folder: '.',
npm: false,
bump: false,
add: false,
commit: false,
file: 'bower.json',
github: {
repo: 'mobify/bellows',
usernameVar: 'GITHUB_USERNAME',
passwordVar: 'GITHUB_TOKEN'
}
}
}
});
releaseMessage: '<%= pkg.name %> release <%= pkg.version %>'
}, config));

// Load the task plugins
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-css');
grunt.loadNpmTasks('grunt-shell');
grunt.loadNpmTasks('grunt-zip');
grunt.loadNpmTasks('grunt-s3');
grunt.loadNpmTasks('grunt-clean');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-release');
// load npm tasks
var npmTasks = [
'grunt-contrib-uglify',
'grunt-contrib-watch',
'grunt-contrib-connect',
'grunt-css',
'grunt-shell',
'grunt-contrib-clean',
'grunt-contrib-copy',
'grunt-autoprefixer',
'grunt-contrib-sass',
'grunt-mocha-phantomjs'
];

// Default task(s).
grunt.registerTask('serve', ['connect', 'watch']);
grunt.registerTask('build', ['copy', 'uglify', 'cssmin', 'zip']);
grunt.registerTask('publish', ['build', 'release', 's3'])
grunt.registerTask('default', 'build');
npmTasks.forEach(function(taskName) {
if (!grunt.task._tasks[taskName]) {
grunt.loadNpmTasks(taskName);
}
});

grunt.registerTask('serve', ['build-dist', 'connect:server', 'watch']);
grunt.registerTask('build-dist', ['copy', 'uglify', 'sass', 'autoprefixer', 'cssmin']);
grunt.registerTask('release', ['test', 'shell:tagRelease']);
grunt.registerTask('test', ['build-dist', 'connect:test', 'mocha_phantomjs']);
grunt.registerTask('test:browser', ['build-dist', 'connect:test:keepalive']);
grunt.registerTask('default', 'build-dist');
};
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2013 Mobify Research &amp; Development Inc.
Copyright (c) 2014 Mobify Research &amp; Development Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Loading