Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 24 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"curly" : true,
"eqeqeq" : true,
"immed" : true,
"latedef" : true,
"newcap" : true,
"noarg" : true,
"sub" : true,
"undef" : true,
"boss" : true,
"eqnull" : true,
"node" : true,
"es5" : false,
"globals" : {
"it" : false,
"xit" : false,
"describe" : false,
"xdescribe" : false,
"beforeEach" : false,
"afterEach" : false,
"expect" : false,
"spyOn" : false
}
}
6 changes: 4 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ module.exports = function(grunt) {
require('load-grunt-tasks')(grunt);

// There are basically three phases of building the production theme:
// 0) Testing / linting
grunt.registerTask('test', ['jshint', 'jasmine']);
// 1) Javascript preparation (concatenating and uglifying scripts)
// (coming soon)
grunt.registerTask('javascript', ['uglify']);
// 2) Stylesheet preparation (SASS, autoprefixing, and minification)
// (coming soon)
// 3) Appending the most recent git commit to the theme version
grunt.registerTask('release', ['gitinfo', 'replace']);
// The default task performs all three phases.
grunt.registerTask('default', ['release']);
grunt.registerTask('default', ['test', 'javascript', 'release']);

};
6 changes: 3 additions & 3 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ function add_styles() {
add_action( 'wp_enqueue_scripts', 'add_styles' );

/**
* Add LazyLoad and MyScripts for all users
* Add LazyLoad and main javascript for all users
*/
function add_scripts() {
wp_enqueue_script( 'lazyload', get_stylesheet_directory_uri() . '/js/lazyload.js', array( 'jquery' ), '', true );
wp_enqueue_script( 'myScripts', get_stylesheet_directory_uri() . '/js/myScripts.js', array( 'lazyload' ), '', true );
wp_enqueue_script( 'lazyload', get_stylesheet_directory_uri() . '/js/build/jquery.lazyload.min.js', array( 'jquery' ), '', true );
wp_enqueue_script( 'mitlibnews', get_stylesheet_directory_uri() . '/js/build/mitlibnews.min.js', array( 'lazyload' ), '', true );
}
add_action( 'wp_enqueue_scripts', 'add_scripts' );

Expand Down
15 changes: 0 additions & 15 deletions js/lazyload.js

This file was deleted.

15 changes: 15 additions & 0 deletions js/mitlibnews.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
var jQuery;

(function($) {

//lazy loading
$("img.img-responsive").lazyload({
effect : "fadeIn",
effectspeed: 450,
failure_limit: 999999
});

//category force selection of all news
$('input:checkbox[id=in-category-43]').attr('checked',true);

})(jQuery);
35 changes: 0 additions & 35 deletions js/myScripts.js

This file was deleted.

3 changes: 3 additions & 0 deletions js/src/mitlibnews.loader.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function Loader(params) {
"use strict";
}
5 changes: 5 additions & 0 deletions js/tests/mitlibnews.loader.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
describe("Loader test suite", function() {
it("expects tautologies", function() {
expect(true).toBe(true);
});
});
8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "mitlibraries-news",
"version": "1.3.0",
"version": "2.0.0",
"description": "A Wordpress child theme that descends from mitlibraries-parent",
"main": "index.js",
"main": "mitlibnews.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
Expand All @@ -22,10 +22,14 @@
"devDependencies": {
"glob": "^7.0.5",
"grunt": "^1.0.1",
"grunt-contrib-jasmine": "^1.0.3",
"grunt-contrib-jshint": "^1.0.0",
"grunt-contrib-uglify": "^2.0.0",
"grunt-gitinfo": "^0.1.8",
"grunt-replace": "^1.0.1"
},
"dependencies": {
"jquery-lazyload": "^1.9.7",
"load-grunt-tasks": "^3.5.0"
}
}
6 changes: 6 additions & 0 deletions tasks/options/jasmine.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
src: 'js/src/**/*.js',
options: {
specs: 'js/tests/**/*.js'
}
}
9 changes: 9 additions & 0 deletions tasks/options/jshint.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
all: [
'Gruntfile.js',
'js/mitlibnews.js'
],
options: {
jshintrc: '.jshintrc'
}
}
10 changes: 10 additions & 0 deletions tasks/options/uglify.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
module.exports = {
core: {
src: 'js/mitlibnews.js',
dest: 'js/build/mitlibnews.min.js'
},
lazyLoad: {
src: 'node_modules/jquery-lazyload/jquery.lazyload.js',
dest: 'js/build/jquery.lazyload.min.js'
}
}