more grunt changes

pull/39/head
Jim Heising 2014-07-03 15:33:38 -07:00
parent 7a9b070cde
commit dbd609ec84
18 changed files with 25001 additions and 19567 deletions

View File

@ -4,15 +4,44 @@ module.exports = function(grunt) {
concat: {
css: {
src: [
'lib/css/**/*.css'
'lib/css/thirdparty/*.css',
'lib/css/freeboard/styles.css'
],
dest: 'css/freeboard.css'
},
js : {
fb : {
src : [
'lib/js/**/*.js'
'lib/js/freeboard/*.js'
],
dest : 'js/freeboard.js'
},
thirdparty : {
src : [
[
'lib/js/thirdparty/head.js',
'lib/js/thirdparty/jquery.js',
'lib/js/thirdparty/jquery-ui.js',
'lib/js/thirdparty/knockout.js',
'lib/js/thirdparty/underscore.js',
'lib/js/thirdparty/jquery.gridster.js',
'lib/js/thirdparty/jquery.caret.js',
'lib/js/thirdparty/codemirror.js',
]
],
dest : 'js/freeboard.thirdparty.js'
},
plugins : {
src : [
'plugins/freeboard/*.js'
],
dest : 'js/freeboard.plugins.js'
},
'fb+plugins' : {
src : [
'js/freeboard.js',
'js/freeboard.plugins.js'
],
dest : 'js/freeboard+plugins.js'
}
},
cssmin : {
@ -22,10 +51,43 @@ module.exports = function(grunt) {
}
},
uglify : {
js: {
fb: {
files: {
'js/freeboard.min.js' : [ 'js/freeboard.js' ]
}
},
plugins: {
files: {
'js/freeboard.plugins.min.js' : [ 'js/freeboard.plugins.js' ]
}
},
thirdparty :{
options: {
mangle : false,
beautify : false,
compress: true
},
files: {
'js/freeboard.thirdparty.min.js' : [ 'js/freeboard.thirdparty.js' ]
}
},
'fb+plugins': {
files: {
'js/freeboard+plugins.min.js' : [ 'js/freeboard+plugins.js' ]
}
}
},
'string-replace': {
css: {
files: {
'css/': 'css/*.css'
},
options: {
replacements: [{
pattern: /..\/..\/..\/img/ig,
replacement: '../img'
}]
}
}
}
});
@ -34,5 +96,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.registerTask('default', [ 'concat:css', 'cssmin:css', 'concat:js', 'uglify:js' ]);
grunt.loadNpmTasks('grunt-string-replace');
grunt.loadNpmTasks('grunt-githooks');
grunt.registerTask('default', [ 'concat:css', 'cssmin:css', 'concat:fb', 'concat:thirdparty', 'concat:plugins', 'concat:fb+plugins', 'uglify:fb', 'uglify:plugins', 'uglify:fb+plugins', 'uglify:thirdparty', 'string-replace:css' ]);
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -1,4 +1,5 @@
<!DOCTYPE html>
<!-- Dev Version links to full versions (non-minified) of javascript and css files -->
<html>
<head>
<meta charset="UTF-8">

View File

@ -6,35 +6,10 @@
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black" />
<meta name="viewport" content = "width = device-width, initial-scale = 1, user-scalable = no" />
<link href="css/jquery.gridster.min.css" rel="stylesheet" />
<link href="css/styles.css" rel="stylesheet" />
<script src="js/head.js"></script>
<link href="css/freeboard.min.css" rel="stylesheet" />
<script src="js/freeboard.thirdparty.min.js"></script>
<script type="text/javascript">
head.js("js/knockout.js",
"js/jquery.js",
"js/jquery-ui.js",
"js/underscore.js",
"js/jquery.gridster.js",
"js/jquery.sparkline.min.js",
"js/jquery.caret.js",
"js/raphael.2.1.0.min.js",
"js/justgage.1.0.1.js",
"js/freeboard/FreeboardModel.js",
"js/freeboard/DatasourceModel.js",
"js/freeboard/PaneModel.js",
"js/freeboard/WidgetModel.js",
"js/freeboard/FreeboardUI.js",
"js/freeboard/DialogBox.js",
"js/freeboard/PluginEditor.js",
"js/freeboard/ValueEditor.js",
"js/freeboard/JSEditor.js",
"js/freeboard/DeveloperConsole.js",
"js/freeboard/freeboard.js",
"js/freeboard/plugins/freeboard.datasources.js",
"js/freeboard/plugins/freeboard.widgets.js",
"examples/plugin_example.js",
head.js("js/freeboard+plugins.min.js",
// *** Load more plugins here ***
function(){
$(function()

File diff suppressed because it is too large Load Diff

2
js/freeboard+plugins.min.js vendored 100644

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

20
js/freeboard.min.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

1
js/freeboard.plugins.min.js vendored 100644

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

20
js/freeboard.thirdparty.min.js vendored 100644

File diff suppressed because one or more lines are too long

View File

@ -1,12 +1,13 @@
{
"name" : "freeboard",
"title" : "freeboard",
"version" : "1.1.0",
"devDependencies": {
"grunt": "0.4.1",
"grunt-contrib-concat": "0.1.3",
"grunt-contrib-cssmin" : "0.6.1",
"grunt-contrib-watch" : "0.5.3",
"grunt-contrib-uglify" : "0.2.0"
}
}
"name": "freeboard",
"title": "freeboard",
"version": "1.1.0",
"devDependencies": {
"grunt": "0.4.1",
"grunt-contrib-concat": "0.1.3",
"grunt-contrib-cssmin": "0.6.1",
"grunt-contrib-watch": "0.5.3",
"grunt-contrib-uglify": "0.2.0",
"grunt-string-replace": "^0.2.7"
}
}

View File

@ -292,6 +292,7 @@
type_name: "gauge",
display_name: "Gauge",
"external_scripts" : [
"plugins/thirdparty/raphael.2.1.0.min.js",
"plugins/thirdparty/justgage.1.0.1.js"
],
settings: [
@ -458,7 +459,7 @@
type_name: "pointer",
display_name: "Pointer",
"external_scripts" : [
"plugins/thirdparty/raphael.2.1.0.js"
"plugins/thirdparty/raphael.2.1.0.min.js"
],
settings: [
{