Skip to content

Commit

Permalink
Merge branch 'master' of github.com:scotch-io/scotch-panels
Browse files Browse the repository at this point in the history
  • Loading branch information
Scotch King committed Sep 25, 2014
2 parents 458e1ec + be83060 commit df414aa
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 27 deletions.
19 changes: 16 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ module.exports = function(grunt) {

pkg: grunt.file.readJSON('package.json'),

concat: {
options: {
banner: '/*\n* <%= pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %> \n' +
'<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
'* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %> \n*/\n'
},
build: {
src: 'src/scotchPanels.js',
dest: 'dist/scotchPanels.js'
}
},

// configure jshint to validate js files -----------------------------------
jshint: {
options: {
Expand All @@ -21,7 +33,7 @@ module.exports = function(grunt) {
},
build: {
files: {
'dist/scotchPanels.min.js': 'src/scotchPanels.js'
'dist/scotchPanels.min.js': 'dist/scotchPanels.js'
}
}
},
Expand All @@ -30,16 +42,17 @@ module.exports = function(grunt) {
watch: {
scripts: {
files: 'src/*.js',
tasks: ['uglify']
tasks: ['concat', 'uglify']
}
}

});

grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');

grunt.registerTask('default', ['uglify']);
grunt.registerTask('default', ['concat', 'uglify']);

};
19 changes: 9 additions & 10 deletions dist/scotchPanels.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
/*
* scotchPanels - v1.0.3 - 2014-09-02
* https://github.com/scotch-io/scotch-panels
* Copyright (c) 2014 Nicholas Cerminara <[email protected]>
*/

* scotchPanels - v1.0.3 - 2014-09-25
* https://github.com/scotch-io/scotch-panels
* Copyright (c) 2014 Nicholas Cerminara <[email protected]>
*/
// Start with Semicolon to block
;(function($) {

Expand Down Expand Up @@ -238,11 +237,11 @@
});
}
panel.css({
'-moz-transform': 'translateZ(0)',
'-ms-transform': 'translateZ(0)',
'-o-transform': 'translateZ(0)',
'-webkit-transform': 'translateZ(0)',
'transform': 'translateZ(0)'
'-moz-backface-visibility': 'hidden',
'-ms-backface-visibility': 'hidden',
'-o-backface-visibility': 'hidden',
'-webkit-backface-visibility': 'hidden',
'backface-visibility': 'hidden'
});

// Photo Logic
Expand Down
Loading

0 comments on commit df414aa

Please sign in to comment.