Skip to content

Commit

Permalink
Build refactor checkpoint
Browse files Browse the repository at this point in the history
Changing sass-bootstrap to official bootstrap-sass. Also refactored JSHint settings. Also removed checked in font files in favour of vendor's fonts
  • Loading branch information
atruskie committed Aug 11, 2015
1 parent b329dc4 commit 2e8d85f
Show file tree
Hide file tree
Showing 10 changed files with 110 additions and 306 deletions.
96 changes: 96 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
{
// JSHint Default Configuration File (as on JSHint website)
// See http://jshint.com/docs/ for more details

"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
"curly" : true, // true: Require {} for every new block or scope
"eqeqeq" : true, // true: Require triple equals (===) for comparison
"forin" : true, // true: Require filtering for..in loops with obj.hasOwnProperty()
"freeze" : true, // true: prohibits overwriting prototypes of native objects such as Array, Date etc.
"immed" : true, // true: Require immediate invocations to be wrapped in parens e.g. `(function () { } ());`
"indent" : 4, // {int} Number of spaces to use for indentation
"latedef" : false, // true: Require variables/functions to be defined before being used
"newcap" : true, // true: Require capitalization of all constructor functions e.g. `new F()`
"noarg" : true, // true: Prohibit use of `arguments.caller` and `arguments.callee`
"noempty" : true, // true: Prohibit use of empty blocks
"nonbsp" : true, // true: Prohibit "non-breaking whitespace" characters.
"nonew" : false, // true: Prohibit use of constructors for side-effects (without assignment)
"plusplus" : false, // true: Prohibit use of `++` & `--`
"quotmark" : "double", // Quotation mark consistency:
// false : do nothing (default)
// true : ensure whatever is used is consistent
// "single" : require single quotes
// "double" : require double quotes
"undef" : true, // true: Require all non-global variables to be declared (prevents global leaks)
"unused" : true, // Unused variables:
// true : all variables, last function parameter
// "vars" : all variables only
// "strict" : all variables, all function parameters
"strict" : true, // true: Requires all functions run in ES5 Strict Mode
"maxparams" : false, // {int} Max number of formal params allowed per function
"maxdepth" : false, // {int} Max depth of nested blocks (within functions)
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line
"varstmt" : false, // true: Disallow any var statements. Only `let` and `const` are allowed.

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
"debug" : false, // true: Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // true: Tolerate use of `== null`
"es5" : true, // true: Allow ES5 syntax (ex: getters and setters)
"esnext" : true, // true: Allow ES.next (ES6) syntax (ex: `const`)
"moz" : false, // true: Allow Mozilla specific syntax (extends and overrides esnext features)
// (ex: `for each`, multiple try/catch, function expression…)
"evil" : false, // true: Tolerate use of `eval` and `new Function()`
"expr" : false, // true: Tolerate `ExpressionStatement` as Programs
"funcscope" : false, // true: Tolerate defining variables inside control statements
"globalstrict" : false, // true: Allow global "use strict" (also enables 'strict')
"iterator" : false, // true: Tolerate using the `__iterator__` property
"lastsemic" : false, // true: Tolerate omitting a semicolon for the last statement of a 1-line block
"laxbreak" : false, // true: Tolerate possibly unsafe line breakings
"laxcomma" : false, // true: Tolerate comma-first style coding
"loopfunc" : false, // true: Tolerate functions being defined in loops
"multistr" : false, // true: Tolerate multi-line strings
"noyield" : false, // true: Tolerate generator functions with no yield statement in them.
"notypeof" : false, // true: Tolerate invalid typeof operator values
"proto" : false, // true: Tolerate using the `__proto__` property
"scripturl" : false, // true: Tolerate script-targeted URLs
"shadow" : false, // true: Allows re-define variables later in code e.g. `var x=1; x=2;`
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : true, // Web Browser (window, document, etc)
"browserify" : false, // Browserify (node.js code in the browser)
"couch" : false, // CouchDB
"devel" : true, // Development/debugging (alert, confirm, etc)
"dojo" : false, // Dojo Toolkit
"jasmine" : false, // Jasmine
"jquery" : false, // jQuery
"mocha" : true, // Mocha
"mootools" : false, // MooTools
"node" : false, // Node.js
"nonstandard" : false, // Widely adopted globals (escape, unescape, etc)
"phantom" : false, // PhantomJS
"prototypejs" : false, // Prototype and Scriptaculous
"qunit" : false, // QUnit
"rhino" : false, // Rhino
"shelljs" : false, // ShellJS
"typed" : false, // Globals for typed array constructions
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface

// Custom Globals
"globals" : { // additional predefined global variables
"angular" : true,
"baw" : true
}
}
23 changes: 4 additions & 19 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@ module.exports = function (grunt) {
* nonetheless inside `src/`.
*/
jshint: {
options: {
jshintrc: ".jshintrc"
},
src: [
'<%= app_files.js %>'
],
Expand All @@ -408,25 +411,7 @@ module.exports = function (grunt) {
],
gruntfile: [
'Gruntfile.js'
],
options: {
curly: true,
immed: true,
newcap: true,
noarg: true,
sub: true,
boss: true,
eqnull: true,
esnext: true,

/* HACK: At some point this should be turned off!" */
force: true,
globals: {
"angular": false,
"baw": true
}
}

]
},

/**
Expand Down
6 changes: 3 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"round-date": "^1.1",
"sass-bootstrap": "3.0.2",
"angular-loading-bar": "~0.7.1",
"ng-form-group": "~1.2.11"
},
"dependencies": {
"ng-form-group": "~1.2.11",
"bootstrap-sass": "~3.3.5"
},
"dependencies": {},
"private": true,
"resolutions": {
"angular": "1.3.x"
Expand Down
7 changes: 5 additions & 2 deletions buildConfig/build.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ module.exports = {
'vendor/jquery-ui/jquery-ui.js',

// NOTE: bootstrap css imported in application.tpl.scss
'vendor/sass-bootstrap/dist/js/bootstrap.js',
// NOTE: bootstrap's own JS not needed because angular-bootstrap does the same job
// and without the jQuery dependency!
//~~"/vendor/bootstrap-sass/assets/javascripts/bootstrap.js",~~
'vendor/angular-bootstrap/ui-bootstrap-tpls.js',
'vendor/ng-form-group/index.js',

Expand Down Expand Up @@ -151,7 +153,8 @@ module.exports = {
template.dest += "styles/images/";

return template;
}
},
"vendor/bootstrap-sass/assets/fonts/bootstrap/**"
]
}
};
51 changes: 0 additions & 51 deletions src/app/home/home.tpl.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,57 +32,6 @@ <h3>{{currentMarkerTitle}}</h3>
<div id="map_canvas" baw-map="projectMap" style="height: 500px; width: 100%;" ui-options="mapOptions"></div>-->


<h3>Experiments</h3>

<p>
<a href="/experiments/tour">Virtual birding tour</a>

<a href="/experiments/rapidScan">Rapid scanning</a>

</p>


<h3>Download annotations</h3>
<label>
<input type="checkbox" ng-model="checked" checked="true" ng-click="testGrowl()" > test binding is {{checked}}
</label>
<label>
<input type="checkbox" ng-model="disabled" > is disabled {{disabled}}
</label>
<br/>
<toggle-switch model="checked" disabled="disabled" >
<toggle-switch-state switch-state="on">
on
</toggle-switch-state>
<span class="toggle-switch-state" switch-state="off">
off
</span>
<i toggle-switch-state="knob">
knobbbbbb
</i >
</toggle-switch>

<br />

<toggle-switch model="checked" disabled="disabled" mode="push-toggle" >
<toggle-switch-state switch-state="on">
on
</toggle-switch-state>
<span class="toggle-switch-state" switch-state="off">
offfffff
</span>
<i toggle-switch-state="knob">
knob
</i >
</toggle-switch>

<br />

<br />

<div class="btn-group">
<button type="button" class="btn btn-default">Left</button>
<button type="button" class="btn btn-default">Middle</button>
<button type="button" class="btn btn-default">Right</button>
</div>
</div>
Binary file removed src/assets/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
Loading

0 comments on commit 2e8d85f

Please sign in to comment.