Skip to content

Commit

Permalink
Merge pull request #102 from latin-language-toolkit/uglify
Browse files Browse the repository at this point in the history 
Minification
  • Loading branch information
@LFDM
LFDM committed May 28, 2014
2 parents ec1beeb + 8f2292f commit 9388033
Show file tree
Hide file tree
Showing 117 changed files with 2,957 additions and 3,339 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ node_modules/*
bower_components/*
*.swp
coverage
dist/
1 change: 1 addition & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ addons:
access_key: "8e76fe91-f0f5-4e47-b839-0b04305a5a5c"
before_install: npm install -g grunt-cli
before_script:
- grunt minify
- grunt server &
- sleep 2
install: npm install && bower install
84 changes: 79 additions & 5 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,29 @@

var srcFiles = 'app/**/*.js';
var htmlFiles = 'app/**/*.html';
var cssFiles = 'app/**/*.css';
var specFiles = 'spec/**/*.js';
var specE2eFiles = 'spec-e2e/**/*.js';
var devServerPort = 8084;
var mountFolder = function(connect, dir) {
var reloadPort = 35279;

function getReloadPort() {
reloadPort++;
return reloadPort;
}

function mountFolder(connect, dir) {
return connect.static(require('path').resolve(dir));
};
}

function pluginFiles(name) {
var minName = 'dist/' + name + '.min.js';
var mainFile = 'app/js/' + name + '.js';
var others = '<%= "app/js/' + name + '/**/*.js" %>';
var obj = {};
obj[minName] = [mainFile, others];
return obj;
}

module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jasmine');
Expand All @@ -18,6 +35,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-coveralls');
grunt.loadNpmTasks('grunt-sauce-connect-launcher');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-concurrent');
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
jasmine: {
Expand All @@ -37,17 +56,43 @@ module.exports = function(grunt) {
files: [srcFiles, specFiles],
tasks: 'spec'
},
server: {
files: [srcFiles, htmlFiles],
serverSource: {
files: srcFiles,
tasks: 'minify',
options: {
livereload: getReloadPort()
}
},
serverHtml: {
files: htmlFiles,
options: {
livereload: getReloadPort()
}
},
serverCss: {
files: cssFiles,
options: {
livereload: true
livereload: getReloadPort()
}
},

e2e: {
files: [srcFiles, specE2eFiles],
tasks: 'protractor:all'
}
},
concurrent: {
watches: {
tasks: [
'watch:serverSource',
'watch:serverHtml',
'watch:serverCss'
],
options: {
logConcurrentOutput: true
}
}
},
jshint: {
options: {
jshintrc: true,
Expand Down Expand Up @@ -156,12 +201,41 @@ module.exports = function(grunt) {
verbose: true
}
}
},
uglify: {
options: {
sourceMap: true,
report: 'gzip'
},
core: { files: pluginFiles('arethusa.core') },
contextMenu: { files: pluginFiles('arethusa.context_menu') },
confEditor: { files: pluginFiles('arethusa.conf_editor') },
morph: { files: pluginFiles('arethusa.morph') },
review: { files: pluginFiles('arethusa.review') },
search: { files: pluginFiles('arethusa.search') },
depTree: { files: pluginFiles('arethusa.dep_tree') },
hist: { files: pluginFiles('arethusa.hist') },
relation: { files: pluginFiles('arethusa.relation') },
exercise: { files: pluginFiles('arethusa.exercise') }
}
});

grunt.registerTask('default', ['karma:spec', 'jshint']);
grunt.registerTask('spec', 'karma:spec');
grunt.registerTask('e2e', 'protractor:all');
grunt.registerTask('server', 'connect:devserver');
grunt.registerTask('reloader', 'concurrent:watches');
grunt.registerTask('minify', [
'uglify:core',
'uglify:morph',
'uglify:contextMenu',
'uglify:confEditor',
'uglify:review',
'uglify:search',
'uglify:depTree',
'uglify:hist',
'uglify:relation',
'uglify:exercise'
]);
grunt.registerTask('sauce', ['sauce_connect', 'protractor:travis', 'sauce-connect-close']);
};
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ bower install

## Usage

To display a rough demo, start a webserver with
To display a rough demo, minify and start a webserver with

```
grunt minify
grunt server
```
A good place to navigate your browser to at the moment would be [http://localhost:8084/app/#/staging2?doc=1&s=2](http://localhost:8084/app/#/staging2?doc=1&s=2)


During development a watch task (`grunt watch:server`) can optionally be
During development a watch task (`grunt reloader`) can optionally be
started - it will live-reload the browser on every change of a js or
html file.
98 changes: 13 additions & 85 deletions app/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html ng-app="arethusa">
<html ng-app="arethusa" ng-di-strict>
<head>
<link rel="stylesheet" href="../bower_components/foundation/css/foundation.min.css">
<link rel="stylesheet" href="../vendor/angular-foundation-colorpicker/css/colorpicker.css">
Expand All @@ -17,89 +17,16 @@
<script src="./js/arethusa_util.js"></script>
<script src="./js/arethusa_logger.js"></script>

<script src="./js/arethusa.core.js"></script>
<script src="./js/arethusa.core/main_ctrl.controller.js"></script>
<script src="./js/arethusa.core/search_ctrl.js"></script>
<script src="./js/arethusa.core/configurator.service.js"></script>
<script src="./js/arethusa.core/navigator_ctrl.controller.js"></script>
<script src="./js/arethusa.core/state.service.js"></script>
<!--<script src="./js/arethusa.core/locator.service.js"></script>-->
<script src="./js/arethusa.core/document_store.service.js"></script>
<script src="./js/arethusa.core/navigator.service.js"></script>
<script src="./js/arethusa.core/resource.factory.js"></script>
<script src="./js/arethusa.core/key_capture.service.js"></script>
<script src="./js/arethusa.core/directives/deselector.directive.js"></script>
<script src="./js/arethusa.core/directives/plugin.directive.js"></script>
<script src="./js/arethusa.core/directives/next_token.directive.js"></script>
<script src="./js/arethusa.core/directives/prev_token.directive.js"></script>
<script src="./js/arethusa.core/directives/fire_event.directive.js"></script>
<script src="./js/arethusa.core/directives/token.js"></script>
<script src="./js/arethusa.core/directives/debug.js"></script>
<script src="./js/arethusa.core/directives/key_capture.directive.js"></script>
<script src="./js/arethusa.core/directives/arethusa_navbar.js"></script>
<script src="./js/arethusa.core/directives/resizable.js"></script>
<script src="./js/arethusa.core/directives/sidepanel_folder.js"></script>
<script src="./js/arethusa.core/directives/value_watch.js"></script>
<script src="./js/arethusa.core/directives/token_with_id.js"></script>

<script src="./js/arethusa.core/routes/main.constant.js"></script>
<script src="./js/arethusa.core/conf_url.factory.js"></script>
<script src="./js/arethusa.core/notifier_ctrl.controller.js"></script>
<script src="./js/arethusa.core/notifier.service.js"></script>

<script src="./js/arethusa.context_menu.js"></script>
<script src="./js/arethusa.context_menu/directives/context_menu.directive.js"></script>
<script src="./js/arethusa.context_menu/directives/arethusa_context_menu.js"></script>
<script src="./js/arethusa.context_menu/directives/plugin_context_menu.js"></script>

<script src="./js/arethusa.conf_editor.js"></script>
<script src="./js/arethusa.conf_editor/conf_editor_ctrl.controller.js"></script>
<script src="./js/arethusa.conf_editor/morph_conf_ctrl.controller.js"></script>
<script src="./js/arethusa.conf_editor/relation_conf_ctrl.controller.js"></script>
<script src="./js/arethusa.conf_editor/directives/tag_tree.js"></script>
<script src="./js/arethusa.conf_editor/directives/plugin_conf.js"></script>
<script src="./js/arethusa.conf_editor/directives/resource_conf.js"></script>
<script src="./js/arethusa.conf_editor/directives/retriever_conf.js"></script>
<script src="./js/arethusa.conf_editor/directives/conf_header.js"></script>
<script src="./js/arethusa.conf_editor/directives/conf_adder.js"></script>
<script src="./js/arethusa.conf_editor/directives/simple_form.js"></script>
<script src="./js/arethusa.conf_editor/directives/relation_label.js"></script>
<script src="./js/arethusa.conf_editor/routes/conf_editor.constant.js"></script>

<script src="./js/arethusa.morph.js"></script>
<script src="./js/arethusa.morph/morph.service.js"></script>
<script src="./js/arethusa.morph/fake_morph_retriever.service.js"></script>
<script src="./js/arethusa.morph/bsp_morph_retriever.factory.js"></script>
<script src="./js/arethusa.morph/directives/morph_form.js"></script>
<script src="./js/arethusa.morph/directives/morph_form_edit.js"></script>
<script src="./js/arethusa.morph/directives/morph_form_create.js"></script>
<script src="./js/arethusa.morph/directives/form_selector.js"></script>
<script src="./js/arethusa.morph/directives/synchronize_postag.js"></script>

<script src="./js/arethusa.review.js"></script>
<script src="./js/arethusa.review/review.service.js"></script>

<script src="./js/arethusa.search.js"></script>
<script src="./js/arethusa.search/search.service.js"></script>

<script src="./js/arethusa.dep_tree.js"></script>
<script src="./js/arethusa.dep_tree/dep_tree.service.js"></script>
<script src="./js/arethusa.dep_tree/subtree_finder.service.js"></script>
<script src="./js/arethusa.dep_tree/directives/dependency_tree.js"></script>

<script src="./js/arethusa.hist.js"></script>
<script src="./js/arethusa.hist/history.service.js"></script>
<script src="./js/arethusa.hist/directives/history_element.js"></script>
<script src="./js/arethusa.hist/directives/history_undo.js"></script>
<script src="./js/arethusa.hist/directives/history_redo.js"></script>

<script src="./js/arethusa.relation.js"></script>
<script src="./js/arethusa.relation/relation.service.js"></script>

<script src="./js/arethusa.exercise.js"></script>
<script src="./js/arethusa.exercise/fill_in_the_blank.service.js"></script>
<script src="./js/arethusa.exercise/instructor.service.js"></script>
<script src="./js/arethusa.exercise/directives/fill_in_the_blank_form.js"></script>
<script src="../dist/arethusa.core.min.js"></script>
<script src="../dist/arethusa.context_menu.min.js"></script>
<script src="../dist/arethusa.conf_editor.min.js"></script>
<script src="../dist/arethusa.morph.min.js"></script>
<script src="../dist/arethusa.review.min.js"></script>
<script src="../dist/arethusa.search.min.js"></script>
<script src="../dist/arethusa.dep_tree.min.js"></script>
<script src="../dist/arethusa.hist.min.js"></script>
<script src="../dist/arethusa.relation.min.js"></script>
<script src="../dist/arethusa.exercise.min.js"></script>

<script src="./js/arethusa.js"></script>
<script src="./js/services/text.js"></script>
Expand All @@ -109,9 +36,10 @@

<script src="./js/external/arethusa_init_plugin.js"></script>
<script src="./js/external/arethusa_external_api.js"></script>

<script src="./js/other/history_obj.js"></script>



<meta charset="UTF-8">
<title></title>
</head>
Expand Down
8 changes: 5 additions & 3 deletions app/js/arethusa.conf_editor.js
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
"use strict";

angular.module('arethusa.confEditor', ['arethusa.core', 'colorpicker.module']);
'use strict';
angular.module('arethusa.confEditor', [
'arethusa.core',
'colorpicker.module'
]);
Loading

0 comments on commit 9388033

Please sign in to comment.