Skip to content
This repository has been archived by the owner on Jan 30, 2018. It is now read-only.

Commit

Permalink
Revert "wip turbolinks"
Browse files Browse the repository at this point in the history
This reverts commit 9fdbc7b.
  • Loading branch information
caarlos0 committed Dec 8, 2013
1 parent 9fdbc7b commit e55f5f7
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 336 deletions.
18 changes: 1 addition & 17 deletions Gruntfile.js
@@ -1,24 +1,12 @@
module.exports = function(grunt) {
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
curl: {
'_assets/turbolinks.coffee': 'https://raw.github.com/rails/turbolinks/master/lib/assets/javascripts/turbolinks.js.coffee'
},
coffee: {
compile: {
files: {
'_assets/turbolinks.coffee.js': '_assets/turbolinks.coffee'
}
}
},
concat: {
dist: {
src: [
'bower_components/jquery/jquery.min.js',
'bower_components/bootstrap/js/transition.js',
'bower_components/bootstrap/js/collapse.js',
'bower_components/nprogress/nprogress.js',
'_assets/turbolinks.coffee.js',
'_assets/up.js'
],
dest: 'js/up.js'
Expand All @@ -35,7 +23,6 @@ module.exports = function(grunt) {
options: {
paths: [
'_assets/',
'bower_components/nprogress/',
'bower_components/bootstrap/less/',
'bower_components/font-awesome/less/'
]
Expand All @@ -48,7 +35,6 @@ module.exports = function(grunt) {
options: {
paths: [
'_assets/',
'bower_components/nprogress/',
'bower_components/bootstrap/less/',
'bower_components/font-awesome/less/'
],
Expand Down Expand Up @@ -95,9 +81,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-coffee');
grunt.loadNpmTasks('grunt-curl');

// Default task(s).
grunt.registerTask('default', ['curl', 'coffee', 'concat', 'uglify', 'less', 'copy']);
grunt.registerTask('default', ['concat', 'uglify', 'less', 'copy']);
};
10 changes: 0 additions & 10 deletions _assets/up.js
@@ -1,10 +0,0 @@
$(document).on('page:fetch', function () {
NProgress.start();
});
$(document).on('page:change', function () {
NProgress.done();
});
$(document).on('page:restore', function () {
NProgress.remove();
});
NProgress.configure({ showSpinner: false });
5 changes: 0 additions & 5 deletions _assets/up.less
Expand Up @@ -79,11 +79,6 @@ h2,h3,h4,h5,h6 {
padding: 5px;
}

#nprogress .bar,
#nprogress .spinner {
z-index: 999999;
}

article,
.content {
height: 100%;
Expand Down
5 changes: 2 additions & 3 deletions bower.json
Expand Up @@ -16,8 +16,7 @@
"tests"
],
"dependencies": {
"bootstrap": "~3.0.2",
"font-awesome": "~4.0.3",
"nprogress": "~0.1.2"
"bootstrap": "~3.0.0",
"font-awesome": "~3.2.1"
}
}
29 changes: 25 additions & 4 deletions css/up.css

Large diffs are not rendered by default.

300 changes: 7 additions & 293 deletions js/up.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/up.min.js

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions package.json
Expand Up @@ -10,8 +10,6 @@
"grunt-contrib-less": "~0.7.0",
"grunt-contrib-concat": "~0.3.0",
"grunt-contrib-watch": "~0.5.3",
"grunt-contrib-copy": "~0.4.1",
"grunt-contrib-coffee": "~0.7.0",
"grunt-curl": "~1.2.1"
"grunt-contrib-copy": "~0.4.1"
}
}

0 comments on commit e55f5f7

Please sign in to comment.