Skip to content
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

Jump to bottom

qfdsqf #5

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

qfdsqf #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50c797a
removed some files
Feb 1, 2015
b8b2ad4
qsdf
Feb 1, 2015
d67fc91
qdsf
Feb 2, 2015
b211f97
qsdf
Feb 2, 2015
e3f833b
qdsf
Feb 2, 2015
011d2d1
qf
Feb 2, 2015
b1be49a
qdsf
Feb 2, 2015
fd75517
qsdf
Feb 2, 2015
aacda4a
qd
Feb 2, 2015
ae4e5e2
qsdf
Feb 2, 2015
3d99905
qdsf
Feb 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file removed .sass-cache/283b4e45f939f43ea889bf5179f0942c1b8fe2a5/ldv.scssc
View file
Open in desktop
Binary file not shown.
42 changes: 30 additions & 12 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,30 @@
module.exports = function (grunt) {

require('load-grunt-tasks')(grunt);
require('time-grunt')(grunt);

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
pkg: grunt.file.readJSON('package.json'),
// Empties folders to start fresh
clean: {
dist: {
files: [{
dot: true,
src: [
'dist/{,*/}*'
]
}]
}
},

copy: {
img: {
expand: true,
cwd: 'src',
src: 'img/*',
dest: 'dist/'
}
},
concat: {
css: {
src: [
Expand Down Expand Up @@ -102,22 +126,16 @@ module.exports = function (grunt) {
watch: {
files: ['src/*', 'src/*/*'],
tasks: ['buildSrc']
}
}
});
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-ngmin');
grunt.loadNpmTasks('grunt-html2js');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-cssmin');

grunt.registerTask('default', ['build']);
grunt.registerTask('build',
['buildConfig', 'buildActions', 'buildSrc', 'buildCss']);
['clean:dist', 'copy:img', 'buildConfig', 'buildActions', 'buildSrc', 'buildCss']);

grunt.registerTask('buildSass', ['concat:scss', 'sass', 'cssmin']);
//grunt.registerTask('buildSass', ['concat:scss', 'sass', 'cssmin']);
grunt.registerTask('buildConfig', ['concat:config', 'uglify:config']);
grunt.registerTask('buildActions', ['concat:actions', 'uglify:actions']);
grunt.registerTask('buildSrc', ['html2js', 'concat:srcjs', 'ngmin:dist'/*, 'uglify:js'*/]);
grunt.registerTask('buildCss', ['concat:css','cssmin']);
};
};
141 changes: 141 additions & 0 deletions Gruntfile.js~
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
module.exports = function (grunt) {

require('load-grunt-tasks')(grunt);
require('time-grunt')(grunt);

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
// Empties folders to start fresh
clean: {
dist: {
files: [{
dot: true,
src: [
'dist/{,*/}*'
]
}]
}
},

copy: {
img: {
expand: true,
cwd: 'src',
src: 'img/*',
dest: 'dist/'
}
},
concat: {
css: {
src: [
'src/**/*.css'
],
dest: 'dist/ldv.css'
},
js: {
src: [
'js/*.js'
],
dest: 'dist/ldv.js'
},
scss: {
src: [
'src/ldv.scss',
'src/**/*.scss'
],
dest: 'dist/ldv.scss'
},
srcjs: {
src: [
'src/ldv.js',
'src/controller.js',
'src/pretty/**/*.js',
'src/services/**/*.js',
'src/taf/**/*.js',
'src/tools/**/*.js',
'src/triple-table/**/*.js',
'src/ui/**/*.js',
'dist/tpls/*.js'
],
dest: 'dist/ldv.js'
},
config: {
src: ['src/dist/config.js'],
dest: 'dist/cfg.js'
},
actions: {
src: ['src/dist/actions/*.js'],
dest: 'dist/actions.js'
}
},
cssmin: {
css: {
src: 'dist/ldv.css',
dest: 'dist/ldv.css'
}
},
ngmin: {
dist: {
files: {
'dist/ldv.js': ['dist/ldv.js']
}
}
},
uglify: {
js: {
files: {
'dist/ldv.js': ['dist/ldv.js']
}
},
config: {
src: 'dist/cfg.js',
dest: 'dist/cfg.js'
},
actions: {
src: 'dist/actions.js',
dest: 'dist/actions.js'
}
},
html2js: {
options: {
module: function(obj, target) {return "ldv.templates."+target;}
},
pretty: {
src: 'src/pretty/**/*.html',
dest: 'dist/tpls/pretty.js'
},
ui: {
src: 'src/ui/**/*.html',
dest: 'dist/tpls/ui.js'
},
tripletable: {
src: 'src/triple-table/**/*.html',
dest: 'dist/tpls/tripletable.js'
},
main: {
src: 'src/tpl/*.html',
dest: 'dist/tpls/main.js'
}
},
sass: {
dist: {
src: 'dist/ldv.scss',
dest: 'dist/ldv.css'
}
},
watch: {
files: ['src/*', 'src/*/*'],
tasks: ['buildSrc']
}
});

grunt.registerTask('default', ['build']);
grunt.registerTask('build',
['clean:dist', 'copy:img', 'buildConfig', 'buildActions', 'buildSrc', 'buildCss']);

grunt.registerTask('buildSass', ['concat:scss', 'sass', 'cssmin']);
grunt.registerTask('buildConfig', ['concat:config', 'uglify:config']);
grunt.registerTask('buildActions', ['concat:actions', 'uglify:actions']);
grunt.registerTask('buildSrc', ['html2js', 'concat:srcjs', 'ngmin:dist'/*, 'uglify:js'*/]);
grunt.registerTask('buildCss', ['concat:css','cssmin']);
};
13 changes: 6 additions & 7 deletions bower_components/jassa/.bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jassa",
"version": "0.0.3-SNAPSHOT",
"version": "0.0.2-SNAPSHOT",
"homepage": "https://github.com/GeoKnow/Jassa",
"authors": [
"Claus Stadler <cstadler@informatik.uni-leipzig.de>"
Expand Down Expand Up @@ -31,14 +31,13 @@
"test",
"tests"
],
"_release": "0.0.3-SNAPSHOT",
"_release": "0.0.2-SNAPSHOT",
"_resolution": {
"type": "version",
"tag": "v0.0.3-SNAPSHOT",
"commit": "1fa302fd051882f1151207560aa652700ad12c3f"
"tag": "v0.0.2-SNAPSHOT",
"commit": "9272a82574a6cb2993603132bbd5e253bb16ebb8"
},
"_source": "git://github.com/GeoKnow/Jassa-Bower.git",
"_target": "0.0.3-SNAPSHOT",
"_originalSource": "jassa",
"_direct": true
"_target": "0.0.2-SNAPSHOT",
"_originalSource": "jassa"
}
2 changes: 1 addition & 1 deletion bower_components/jassa/bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jassa",
"version": "0.0.3-SNAPSHOT",
"version": "0.0.2",
"homepage": "https://github.com/GeoKnow/Jassa",
"authors": [
"Claus Stadler <cstadler@informatik.uni-leipzig.de>"
Expand Down
Loading