Skip to content

Minimize javascript assets #2235

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

Open
hectorespert wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Minimize javascript assets #2235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 26 additions & 13 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

'use strict';

module.exports = function(grunt) {
module.exports = function (grunt) {
// Project configuration.
grunt.initConfig({
less: {
Expand All @@ -21,24 +21,37 @@ module.exports = function(grunt) {
'oc-admin/themes/modern/css/main.css': 'oc-admin/themes/modern/less/main.less'
}
}
},
sass: {
dist: {
options: {
style: 'compressed',
compass: true
},
files: {
'oc-content/themes/bender/css/main.css': 'oc-content/themes/bender/sass/main.scss'
}
}
},
sass: {
dist: {
options: {
style: 'compressed',
compass: true
},
files: {
'oc-content/themes/bender/css/main.css': 'oc-content/themes/bender/sass/main.scss'
}
}
},
uglify: {
options: {
mangle: false
},
target: {
files: {
'oc-includes/osclass/assets/js/date.min.js': 'oc-includes/osclass/assets/js/date.js',
'oc-includes/osclass/assets/js/jquery.json.min.js': 'oc-includes/osclass/assets/js/jquery.json.js',
'oc-includes/osclass/assets/js/jquery.treeview.min.js': 'oc-includes/osclass/assets/js/jquery.treeview.js',
'oc-includes/osclass/assets/js/jquery.ui.nestedSortable.min.js': 'oc-includes/osclass/assets/js/jquery.ui.nestedSortable.js'
}
}
}
});

// Actually load this plugin's task(s).
grunt.loadTasks('tasks');

grunt.loadNpmTasks('grunt-contrib-less');

grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-uglify');
};
1 change: 1 addition & 0 deletions oc-includes/osclass/assets/js/date.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions oc-includes/osclass/assets/js/jquery.json.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions oc-includes/osclass/assets/js/jquery.treeview.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions oc-includes/osclass/assets/js/jquery.ui.nestedSortable.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion oc-includes/osclass/install.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
<script src="<?php echo get_absolute_url(); ?>oc-includes/osclass/assets/js/jquery.min.js" type="text/javascript"></script>
<script src="<?php echo get_absolute_url(); ?>oc-includes/osclass/assets/js/jquery-ui.min.js" type="text/javascript"></script>
<script src="<?php echo get_absolute_url(); ?>oc-includes/osclass/installer/vtip/vtip.js" type="text/javascript"></script>
<script src="<?php echo get_absolute_url(); ?>oc-includes/osclass/assets/js/jquery.json.js" type="text/javascript"></script>
<script src="<?php echo get_absolute_url(); ?>oc-includes/osclass/assets/js/jquery.json.min.js" type="text/javascript"></script>
<script src="<?php echo get_absolute_url(); ?>oc-includes/osclass/installer/install.js" type="text/javascript"></script>
<script src="<?php echo get_absolute_url(); ?>oc-admin/themes/modern/js/location.js" type="text/javascript"></script>
<link rel="stylesheet" type="text/css" media="all" href="<?php echo get_absolute_url(); ?>oc-includes/osclass/installer/install.css" />
Expand Down
Loading