switched from grunt to gulp

pull/3113/head
kayone 10 years ago
parent 5cfe2c0186
commit 4d23b2cac3

@ -1,185 +0,0 @@
module.exports = function (grunt) {
'use strict';
var outputRoot = '_output/';
var outputDir = outputRoot +'UI/';
var srcRoot = 'src/UI/';
var srcContent = srcRoot + 'Content/';
var destContent = outputDir + 'Content/';
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
clean: {
output: outputDir,
scripts: [ outputDir + '/**.js','!_output/UI/**/templates.js']
},
less : {
options:{
dumpLineNumbers : 'false',
compress : true,
yuicompress : false,
ieCompat : true,
strictImports : true
},
bootstrap: {
src : srcContent + 'bootstrap.less',
dest: destContent + 'bootstrap.css'
},
general : {
cwd : srcRoot,
expand : true,
src :[
'Content/theme.less',
'Content/overrides.less',
'Series/series.less',
'History/history.less',
'AddSeries/addSeries.less',
'Calendar/calendar.less',
'Cells/cells.less',
'Settings/settings.less',
'System/Logs/logs.less',
'System/Update/update.less'
],
dest : outputDir,
ext: '.css'
}
},
handlebars: {
options: {
namespace : 'T',
partialRegex: /Partial.hbs/,
wrapped : true,
amd : true,
processName: function (fileName) {
return fileName
.replace(srcRoot, '')
.replace('.hbs', '')
.toLowerCase();
}
},
files : {
src : [ srcRoot + '**/*Template.hbs', srcRoot + '**/*Partial.hbs'],
dest: outputDir + 'templates.js'
}
},
copy: {
content: {
cwd : srcRoot,
expand: true,
src : [
'index.html',
'**/*.css',
'**/*.png',
'**/*.jpg',
'**/*.ico',
'**/*.swf',
'**/FontAwesome/*.*',
'**/fonts/*.*'
],
dest : outputDir
},
scripts: {
cwd : srcRoot,
expand: true,
src : [
'**/*.js'
],
dest : outputDir
}
},
jshint: {
options: {
'-W030': false,
'-W064': false,
'-W097': false,
'-W100': false,
'undef': true,
'globals': {
'require': true,
'define': true,
'window': true,
'document': true,
'console': true
}
},
all: [
srcRoot + '**/*.js',
'!**/JsLibraries/*.js'
]
},
requirejs: {
compile:{
options: {
mainConfigFile: 'src/UI/app.js',
fileExclusionRegExp: /^.*\.(?!js$)[^.]+$/,
preserveLicenseComments: false,
dir: outputDir,
optimize: 'none',
removeCombined: true,
inlineText: false,
keepBuildDir : true,
modules: [{
name: 'app',
exclude: ['templates.js']
}]
}
}
},
watch: {
options: {
nospawn: false
},
bootstrap : {
files: [ srcContent + 'Bootstrap/**', srcContent + 'FontAwesome/**', srcContent + 'bootstrap.less'],
tasks: ['less:bootstrap','less:general']
},
generalLess: {
files: [ srcRoot + '**/*.less', '!**/Bootstrap/**', '!**/FontAwesome/**', '!' + srcContent + '/bootstrap.less'],
tasks: ['less:general']
},
handlebars : {
files: '<%= handlebars.files.src %>',
tasks: ['handlebars']
},
content : {
files: [
srcRoot + '**/index.html',
srcRoot + '**/*.css',
srcRoot + '**/*.png',
srcRoot + '**/*.jpg',
srcRoot + '**/*.ico',
srcRoot + '**/FontAwesome/*.*',
srcRoot + '**/fonts/*.*'
],
tasks: ['copy:content']
},
scripts: {
files: '<%= copy.scripts.cwd %><%= copy.scripts.src %>',
tasks: ['copy:scripts']
}
}
});
grunt.loadNpmTasks('grunt-contrib-handlebars');
grunt.loadNpmTasks('grunt-contrib-less');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-notify');
grunt.loadNpmTasks('grunt-contrib-requirejs');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.registerTask('package', ['clean:output', 'jshint', 'handlebars', 'copy', 'less']);
grunt.registerTask('packagerjs', ['clean:output','jshint', 'handlebars', 'requirejs', 'copy:content', 'less']);
grunt.registerTask('default', ['package', 'watch']);
};

@ -191,17 +191,17 @@ Function PackageTests()
Function RunGrunt() Function RunGrunt()
{ {
Write-Host "##teamcity[progressStart 'Running Grunt']" Write-Host "##teamcity[progressStart 'Running Gulp']"
$gruntPath = [environment]::getfolderpath("applicationdata") + '\npm\node_modules\grunt-cli\bin\grunt' $gulpPath = '.\node_modules\gulp\bin\gulp'
Invoke-Expression 'npm install' Invoke-Expression 'npm install'
CheckExitCode CheckExitCode
Invoke-Expression ('node ' + $gruntPath + ' packagerjs') -ErrorAction Continue -Verbose Invoke-Expression ('node ' + $gulpPath + ' build') -ErrorAction Continue -Verbose
CheckExitCode CheckExitCode
Remove-Item $outputFolder\UI\build.txt -ErrorAction Continue Remove-Item $outputFolder\UI\build.txt -ErrorAction Continue
Write-Host "##teamcity[progressFinish 'Running Grunt']" Write-Host "##teamcity[progressFinish 'Running Gulp']"
} }
Function CheckExitCode() Function CheckExitCode()

@ -0,0 +1,13 @@
var gulp = require('gulp');
var runSequence = require('run-sequence');
require('./clean');
require('./requirejs');
require('./less');
require('./handlebars');
require('./copy');
gulp.task('build', function () {
return runSequence('clean',
['requireJs', 'less', 'handlebars', 'copyIndex', 'copyContent']);
});

@ -0,0 +1,9 @@
var gulp = require('gulp');
var clean = require('gulp-clean');
var paths = require('./paths');
gulp.task('clean', function () {
return gulp.src(paths.dest.root, {read: false})
.pipe(clean());
});

@ -0,0 +1,22 @@
var gulp = require('gulp');
var print = require('gulp-print');
var cache = require('gulp-cached');
var paths = require('./paths.js');
gulp.task('copyJs', function () {
return gulp.src([paths.src.scripts])
.pipe(cache())
.pipe(gulp.dest(paths.dest.root));
});
gulp.task('copyIndex', function () {
return gulp.src(paths.src.index)
.pipe(cache())
.pipe(gulp.dest(paths.dest.root));
});
gulp.task('copyContent', function () {
return gulp.src([paths.src.content + '**/*.*', '!**/*.less'])
.pipe(gulp.dest(paths.dest.content));
});

@ -0,0 +1,11 @@
require('./watch.js');
require('./build.js');
require('./clean.js');
require('./requirejs.js');
require('./jshint.js');
require('./handlebars.js');
require('./copy.js');
require('./less.js');
require('./stripBom.js');

@ -0,0 +1,57 @@
var gulp = require('gulp');
var handlebars = require('gulp-handlebars');
var declare = require('gulp-declare');
var concat = require('gulp-concat');
var wrapAmd = require('gulp-wrap-amd');
var wrap = require("gulp-wrap");
var path = require('path');
var streamqueue = require('streamqueue');
var paths = require('./paths.js');
var bom = require('./pipelines/gulp-bom.js');
gulp.task('handlebars', function () {
var coreStream = gulp.src([paths.src.templates, '!*/**/*Partial.*'])
.pipe(bom())
.pipe(handlebars())
.pipe(declare({
namespace: 'T',
noRedeclare: true,
processName: function (filePath) {
filePath = path.relative(paths.src.root, filePath);
return filePath.replace(/\\/g, '/')
.toLocaleLowerCase()
.replace('template', '')
.replace('.js', '');
}
}));
var partialStream = gulp.src([paths.src.partials])
.pipe(bom())
.pipe(handlebars())
.pipe(wrap('Handlebars.template(<%= contents %>)'))
.pipe(wrap('Handlebars.registerPartial(<%= processPartialName(file.relative) %>, <%= contents %>)', {}, {
imports: {
processPartialName: function (fileName) {
return JSON.stringify(
path.basename(fileName, '.js')
);
}
}
}));
return streamqueue({ objectMode: true },
partialStream,
coreStream
).pipe(concat('templates.js'))
.pipe(wrapAmd({
deps: ['handlebars'],
params: ['Handlebars'],
exports: 'this["T"]'
}))
.pipe(gulp.dest(paths.dest.root));
});

@ -0,0 +1,26 @@
var gulp = require('gulp');
var jshint = require('gulp-jshint');
var stylish = require('jshint-stylish');
var cache = require('gulp-cached');
var paths = require('./paths.js');
gulp.task('jshint', function () {
return gulp.src([paths.src.scripts, paths.src.exclude.libs])
.pipe(cache())
.pipe(jshint({
'-W030': false,
'-W064': false,
'-W097': false,
'-W100': false,
'undef': true,
'globals': {
'require': true,
'define': true,
'window': true,
'document': true,
'console': true
}
}))
.pipe(jshint.reporter(stylish));
});

@ -0,0 +1,30 @@
var gulp = require('gulp');
var less = require('gulp-less');
var print = require('gulp-print');
var paths = require('./paths');
gulp.task('less', function () {
return gulp.src([
paths.src.content + 'bootstrap.less',
paths.src.content + 'theme.less',
paths.src.content + 'overrides.less',
paths.src.root + 'Series/series.less',
paths.src.root + 'History/history.less',
paths.src.root + 'AddSeries/addSeries.less',
paths.src.root + 'Calendar/calendar.less',
paths.src.root + 'Cells/cells.less',
paths.src.root + 'Settings/settings.less',
paths.src.root + 'System/Logs/logs.less',
paths.src.root + 'System/Update/update.less',
])
.pipe(print())
.pipe(less({
dumpLineNumbers: 'false',
compress: true,
yuicompress: true,
ieCompat: true,
strictImports: true
}))
.pipe(gulp.dest(paths.dest.content));
});

@ -0,0 +1,26 @@
module.exports = {
js: [
'./app/**/*.js',
'./src/**/*.js',
'!./**/libs/**',
'!./**/vendor/**',
'!./**/templates.js'
],
src: {
root: './src/UI/',
templates: './src/UI/**/*.hbs',
index: './src/UI/index.html',
partials: './src/UI/**/*Partial.hbs',
scripts: './src/UI/**/*.js',
less: ['./src/UI/**/*.less'],
content: './src/UI/Content/',
exclude :{
libs:'!./src/UI/JsLibraries/**'
}
},
dest: {
root: './_output/UI/',
content: './_output/UI/Content/'
}
};

@ -0,0 +1,4 @@
var replace = require('gulp-replace');
module.exports = function() {
return replace(/^\uFEFF/, '');
};

@ -0,0 +1,32 @@
var gulp = require('gulp');
var requirejs = require('requirejs');
var paths = require('./paths');
require('./handlebars.js');
require('./jshint.js');
gulp.task('requireJs', ['jshint'], function (cb) {
var config = {
mainConfigFile: 'src/UI/app.js',
fileExclusionRegExp: /^.*\.(?!js$)[^.]+$/,
preserveLicenseComments: false,
dir: paths.dest.root,
optimize: 'none',
removeCombined: true,
inlineText: false,
keepBuildDir: true,
modules: [
{
name: 'app',
exclude: ['templates.js']
}
]};
requirejs.optimize(config, function (buildResponse) {
console.log(buildResponse);
cb();
});
});

@ -0,0 +1,25 @@
var gulp = require('gulp');
var paths = require('./paths.js');
var bom = require('./pipelines/gulp-bom.js');
var gulpPrint = require('gulp-print');
var stripBom = function (dest) {
gulp.src([paths.src.root, paths.src.exclude.libs])
.pipe(bom())
.pipe(gulpPrint(function (filepath) {
return "booming: " + filepath;
}))
.pipe(gulp.dest(dest));
gulp.src(paths.src.templates)
.pipe(bom())
.pipe(gulpPrint(function (filepath) {
return "booming: " + filepath;
}))
.pipe(gulp.dest(dest));
};
gulp.task('stripBom', function () {
stripBom(paths.src.root);
});

@ -0,0 +1,30 @@
var gulp = require('gulp');
//var livereload = require('gulp-livereload');
var paths = require('./paths.js');
require('./jshint.js');
require('./handlebars.js');
require('./less.js');
require('./copy.js');
gulp.task('watch', ['jshint', 'handlebars', 'less', 'copyJs'], function () {
gulp.watch([paths.src.scripts, paths.src.exclude.libs], ['jshint', 'copyJs']);
gulp.watch(paths.src.templates, ['handlebars']);
gulp.watch([paths.src.less, paths.src.exclude.libs], ['less']);
gulp.watch([paths.src.index], ['copyIndex']);
gulp.watch([paths.src.content + '**/*.*', '!**/*.less'], ['copyContent']);
});
gulp.task('liveReload', ['jshint', 'handlebars', 'less', 'copyJs'], function () {
var server = livereload();
gulp.watch([
'app/**/*.js',
'app/**/*.css',
'app/index.html'
]).on('change', function (file) {
server.changed(file.path);
});
});

@ -0,0 +1 @@
require('./gulp/gulpfile.js');

@ -4,7 +4,7 @@
"description": "NZBDrone", "description": "NZBDrone",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"preinstall": "npm install grunt-cli -g" "preinstall": ""
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -15,14 +15,22 @@
"gitHead": "9ff7aa1bf7fe38c4c5bdb92f56c8ad556916ed67", "gitHead": "9ff7aa1bf7fe38c4c5bdb92f56c8ad556916ed67",
"readmeFilename": "readme.md", "readmeFilename": "readme.md",
"dependencies": { "dependencies": {
"grunt": "*", "gulp": "^3.8.7",
"grunt-contrib-handlebars": "*", "gulp-handlebars": "^2.2.0",
"grunt-contrib-watch": "*", "gulp-declare": "^0.3.0",
"grunt-contrib-less": "0.8.3", "gulp-clean": "^0.3.1",
"grunt-contrib-copy": "*", "gulp-concat": "^2.3.4",
"grunt-notify": "*", "gulp-wrap-amd": "^0.3.1",
"grunt-contrib-clean": "*", "gulp-wrap": "^0.3.0",
"grunt-contrib-requirejs": "*", "streamqueue": "^0.1.1",
"grunt-contrib-jshint": "*" "gulp-replace": "^0.4.0",
"fs-extra": "^0.11.0",
"gulp-print": "^1.1.0",
"gulp-less": "^1.3.5",
"gulp-jshint": "^1.8.4",
"gulp-cached": "^1.0.1",
"jshint-stylish": "^0.4.0",
"requirejs": "^2.1.14",
"run-sequence": "^0.3.6"
} }
} }

@ -1,5 +1,5 @@
@import "Bootstrap/variables"; @import "../Bootstrap/variables";
@import "Bootstrap/mixins"; @import "../Bootstrap/mixins";
.toggle { .toggle {
height: 34px; height: 34px;

@ -2,6 +2,7 @@
define( define(
[ [
'templates', 'templates',
'handlebars',
'handlebars.helpers', 'handlebars.helpers',
'Handlebars/Helpers/DateTime', 'Handlebars/Helpers/DateTime',
'Handlebars/Helpers/Html', 'Handlebars/Helpers/Html',
@ -13,11 +14,10 @@ define(
'Handlebars/Helpers/EachReverse', 'Handlebars/Helpers/EachReverse',
'Handlebars/Helpers/String', 'Handlebars/Helpers/String',
'Handlebars/Handlebars.Debug' 'Handlebars/Handlebars.Debug'
], function (Templates) { ], function (Templates, Handlebars) {
return function () { return function () {
this.get = function (templateId) { this.get = function (templateId) {
var templateKey = templateId.toLowerCase().replace('template', '');
var templateKey = templateId.toLowerCase();
var templateFunction = Templates[templateKey]; var templateFunction = Templates[templateKey];
@ -28,7 +28,8 @@ define(
return function (data) { return function (data) {
try { try {
return templateFunction(data); var wrappedTemplate = Handlebars.template.call(Handlebars, templateFunction);
return wrappedTemplate(data);
} }
catch (error) { catch (error) {
console.error('template render failed for ' + templateKey + ' ' + error); console.error('template render failed for ' + templateKey + ' ' + error);

@ -1,147 +1,275 @@
/* /*!
handlebars v1.3.0
Copyright (C) 2011 by Yehuda Katz
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
@license
*/
/* exported Handlebars */
var Handlebars = (function() {
// handlebars/safe-string.js
var __module3__ = (function() {
"use strict";
var __exports__;
// Build out our basic SafeString type
function SafeString(string) {
this.string = string;
}
Copyright (C) 2011 by Yehuda Katz SafeString.prototype.toString = function() {
return "" + this.string;
};
Permission is hereby granted, free of charge, to any person obtaining a copy __exports__ = SafeString;
of this software and associated documentation files (the "Software"), to deal return __exports__;
in the Software without restriction, including without limitation the rights })();
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in // handlebars/utils.js
all copies or substantial portions of the Software. var __module2__ = (function(__dependency1__) {
"use strict";
var __exports__ = {};
/*jshint -W004 */
var SafeString = __dependency1__;
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR var escape = {
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, "&": "&amp;",
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE "<": "&lt;",
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ">": "&gt;",
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, '"': "&quot;",
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN "'": "&#x27;",
THE SOFTWARE. "`": "&#x60;"
};
@license var badChars = /[&<>"'`]/g;
*/ var possible = /[&<>"'`]/;
// lib/handlebars/browser-prefix.js function escapeChar(chr) {
(function(undefined) { return escape[chr] || "&amp;";
var Handlebars = {}; }
;
// lib/handlebars/base.js
Handlebars.VERSION = "1.0.0"; function extend(obj, value) {
Handlebars.COMPILER_REVISION = 4; for(var key in value) {
if(Object.prototype.hasOwnProperty.call(value, key)) {
obj[key] = value[key];
}
}
}
Handlebars.REVISION_CHANGES = { __exports__.extend = extend;var toString = Object.prototype.toString;
__exports__.toString = toString;
// Sourced from lodash
// https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
var isFunction = function(value) {
return typeof value === 'function';
};
// fallback for older versions of Chrome and Safari
if (isFunction(/x/)) {
isFunction = function(value) {
return typeof value === 'function' && toString.call(value) === '[object Function]';
};
}
var isFunction;
__exports__.isFunction = isFunction;
var isArray = Array.isArray || function(value) {
return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
};
__exports__.isArray = isArray;
function escapeExpression(string) {
// don't escape SafeStrings, since they're already safe
if (string instanceof SafeString) {
return string.toString();
} else if (!string && string !== 0) {
return "";
}
// Force a string conversion as this will be done by the append regardless and
// the regex test will do this transparently behind the scenes, causing issues if
// an object's to string has escaped characters in it.
string = "" + string;
if(!possible.test(string)) { return string; }
return string.replace(badChars, escapeChar);
}
__exports__.escapeExpression = escapeExpression;function isEmpty(value) {
if (!value && value !== 0) {
return true;
} else if (isArray(value) && value.length === 0) {
return true;
} else {
return false;
}
}
__exports__.isEmpty = isEmpty;
return __exports__;
})(__module3__);
// handlebars/exception.js
var __module4__ = (function() {
"use strict";
var __exports__;
var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
function Exception(message, node) {
var line;
if (node && node.firstLine) {
line = node.firstLine;
message += ' - ' + line + ':' + node.firstColumn;
}
var tmp = Error.prototype.constructor.call(this, message);
// Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
for (var idx = 0; idx < errorProps.length; idx++) {
this[errorProps[idx]] = tmp[errorProps[idx]];
}
if (line) {
this.lineNumber = line;
this.column = node.firstColumn;
}
}
Exception.prototype = new Error();
__exports__ = Exception;
return __exports__;
})();
// handlebars/base.js
var __module1__ = (function(__dependency1__, __dependency2__) {
"use strict";
var __exports__ = {};
var Utils = __dependency1__;
var Exception = __dependency2__;
var VERSION = "1.3.0";
__exports__.VERSION = VERSION;var COMPILER_REVISION = 4;
__exports__.COMPILER_REVISION = COMPILER_REVISION;
var REVISION_CHANGES = {
1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it 1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
2: '== 1.0.0-rc.3', 2: '== 1.0.0-rc.3',
3: '== 1.0.0-rc.4', 3: '== 1.0.0-rc.4',
4: '>= 1.0.0' 4: '>= 1.0.0'
}; };
__exports__.REVISION_CHANGES = REVISION_CHANGES;
var isArray = Utils.isArray,
isFunction = Utils.isFunction,
toString = Utils.toString,
objectType = '[object Object]';
Handlebars.helpers = {}; function HandlebarsEnvironment(helpers, partials) {
Handlebars.partials = {}; this.helpers = helpers || {};
this.partials = partials || {};
var toString = Object.prototype.toString, registerDefaultHelpers(this);
functionType = '[object Function]', }
objectType = '[object Object]';
__exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
constructor: HandlebarsEnvironment,
Handlebars.registerHelper = function(name, fn, inverse) { logger: logger,
log: log,
registerHelper: function(name, fn, inverse) {
if (toString.call(name) === objectType) { if (toString.call(name) === objectType) {
if (inverse || fn) { throw new Handlebars.Exception('Arg not supported with multiple helpers'); } if (inverse || fn) { throw new Exception('Arg not supported with multiple helpers'); }
Handlebars.Utils.extend(this.helpers, name); Utils.extend(this.helpers, name);
} else { } else {
if (inverse) { fn.not = inverse; } if (inverse) { fn.not = inverse; }
this.helpers[name] = fn; this.helpers[name] = fn;
} }
}; },
Handlebars.registerPartial = function(name, str) { registerPartial: function(name, str) {
if (toString.call(name) === objectType) { if (toString.call(name) === objectType) {
Handlebars.Utils.extend(this.partials, name); Utils.extend(this.partials, name);
} else { } else {
this.partials[name] = str; this.partials[name] = str;
} }
}; }
};
Handlebars.registerHelper('helperMissing', function(arg) { function registerDefaultHelpers(instance) {
instance.registerHelper('helperMissing', function(arg) {
if(arguments.length === 2) { if(arguments.length === 2) {
return undefined; return undefined;
} else { } else {
throw new Error("Missing helper: '" + arg + "'"); throw new Exception("Missing helper: '" + arg + "'");
} }
}); });
Handlebars.registerHelper('blockHelperMissing', function(context, options) { instance.registerHelper('blockHelperMissing', function(context, options) {
var inverse = options.inverse || function() {}, fn = options.fn; var inverse = options.inverse || function() {}, fn = options.fn;
var type = toString.call(context); if (isFunction(context)) { context = context.call(this); }
if(type === functionType) { context = context.call(this); }
if(context === true) { if(context === true) {
return fn(this); return fn(this);
} else if(context === false || context == null) { } else if(context === false || context == null) {
return inverse(this); return inverse(this);
} else if(type === "[object Array]") { } else if (isArray(context)) {
if(context.length > 0) { if(context.length > 0) {
return Handlebars.helpers.each(context, options); return instance.helpers.each(context, options);
} else { } else {
return inverse(this); return inverse(this);
} }
} else { } else {
return fn(context); return fn(context);
} }
}); });
Handlebars.K = function() {};
Handlebars.createFrame = Object.create || function(object) {
Handlebars.K.prototype = object;
var obj = new Handlebars.K();
Handlebars.K.prototype = null;
return obj;
};
Handlebars.logger = {
DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
// can be overridden in the host environment
log: function(level, obj) {
if (Handlebars.logger.level <= level) {
var method = Handlebars.logger.methodMap[level];
if (typeof console !== 'undefined' && console[method]) {
console[method].call(console, obj);
}
}
}
};
Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); }; instance.registerHelper('each', function(context, options) {
Handlebars.registerHelper('each', function(context, options) {
var fn = options.fn, inverse = options.inverse; var fn = options.fn, inverse = options.inverse;
var i = 0, ret = "", data; var i = 0, ret = "", data;
var type = toString.call(context); if (isFunction(context)) { context = context.call(this); }
if(type === functionType) { context = context.call(this); }
if (options.data) { if (options.data) {
data = Handlebars.createFrame(options.data); data = createFrame(options.data);
} }
if(context && typeof context === 'object') { if(context && typeof context === 'object') {
if(context instanceof Array){ if (isArray(context)) {
for(var j = context.length; i<j; i++) { for(var j = context.length; i<j; i++) {
if (data) { data.index = i; } if (data) {
data.index = i;
data.first = (i === 0);
data.last = (i === (context.length-1));
}
ret = ret + fn(context[i], { data: data }); ret = ret + fn(context[i], { data: data });
} }
} else { } else {
for(var key in context) { for(var key in context) {
if(context.hasOwnProperty(key)) { if(context.hasOwnProperty(key)) {
if(data) { data.key = key; } if(data) {
data.key = key;
data.index = i;
data.first = (i === 0);
}
ret = ret + fn(context[key], {data: data}); ret = ret + fn(context[key], {data: data});
i++; i++;
} }
@ -154,221 +282,249 @@ Handlebars.registerHelper('each', function(context, options) {
} }
return ret; return ret;
}); });
Handlebars.registerHelper('if', function(conditional, options) { instance.registerHelper('if', function(conditional, options) {
var type = toString.call(conditional); if (isFunction(conditional)) { conditional = conditional.call(this); }
if(type === functionType) { conditional = conditional.call(this); }
if(!conditional || Handlebars.Utils.isEmpty(conditional)) { // Default behavior is to render the positive path if the value is truthy and not empty.
// The `includeZero` option may be set to treat the condtional as purely not empty based on the
// behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
return options.inverse(this); return options.inverse(this);
} else { } else {
return options.fn(this); return options.fn(this);
} }
}); });
Handlebars.registerHelper('unless', function(conditional, options) { instance.registerHelper('unless', function(conditional, options) {
return Handlebars.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn}); return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
}); });
Handlebars.registerHelper('with', function(context, options) { instance.registerHelper('with', function(context, options) {
var type = toString.call(context); if (isFunction(context)) { context = context.call(this); }
if(type === functionType) { context = context.call(this); }
if (!Handlebars.Utils.isEmpty(context)) return options.fn(context); if (!Utils.isEmpty(context)) return options.fn(context);
}); });
Handlebars.registerHelper('log', function(context, options) { instance.registerHelper('log', function(context, options) {
var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1; var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
Handlebars.log(level, context); instance.log(level, context);
}); });
;
// lib/handlebars/utils.js
var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
Handlebars.Exception = function(message) {
var tmp = Error.prototype.constructor.apply(this, arguments);
// Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
for (var idx = 0; idx < errorProps.length; idx++) {
this[errorProps[idx]] = tmp[errorProps[idx]];
} }
};
Handlebars.Exception.prototype = new Error();
// Build out our basic SafeString type var logger = {
Handlebars.SafeString = function(string) { methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
this.string = string;
};
Handlebars.SafeString.prototype.toString = function() {
return this.string.toString();
};
var escape = { // State enum
"&": "&amp;", DEBUG: 0,
"<": "&lt;", INFO: 1,
">": "&gt;", WARN: 2,
'"': "&quot;", ERROR: 3,
"'": "&#x27;", level: 3,
"`": "&#x60;"
};
var badChars = /[&<>"'`]/g; // can be overridden in the host environment
var possible = /[&<>"'`]/; log: function(level, obj) {
if (logger.level <= level) {
var method = logger.methodMap[level];
if (typeof console !== 'undefined' && console[method]) {
console[method].call(console, obj);
}
}
}
};
__exports__.logger = logger;
function log(level, obj) { logger.log(level, obj); }
var escapeChar = function(chr) { __exports__.log = log;var createFrame = function(object) {
return escape[chr] || "&amp;"; var obj = {};
}; Utils.extend(obj, object);
return obj;
};
__exports__.createFrame = createFrame;
return __exports__;
})(__module2__, __module4__);
// handlebars/runtime.js
var __module5__ = (function(__dependency1__, __dependency2__, __dependency3__) {
"use strict";
var __exports__ = {};
var Utils = __dependency1__;
var Exception = __dependency2__;
var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
function checkRevision(compilerInfo) {
var compilerRevision = compilerInfo && compilerInfo[0] || 1,
currentRevision = COMPILER_REVISION;
Handlebars.Utils = { if (compilerRevision !== currentRevision) {
extend: function(obj, value) { if (compilerRevision < currentRevision) {
for(var key in value) { var runtimeVersions = REVISION_CHANGES[currentRevision],
if(value.hasOwnProperty(key)) { compilerVersions = REVISION_CHANGES[compilerRevision];
obj[key] = value[key]; throw new Exception("Template was precompiled with an older version of Handlebars than the current runtime. "+
"Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
} else {
// Use the embedded version info since the runtime doesn't know about this revision yet
throw new Exception("Template was precompiled with a newer version of Handlebars than the current runtime. "+
"Please update your runtime to a newer version ("+compilerInfo[1]+").");
} }
} }
},
escapeExpression: function(string) {
// don't escape SafeStrings, since they're already safe
if (string instanceof Handlebars.SafeString) {
return string.toString();
} else if (string == null || string === false) {
return "";
} }
// Force a string conversion as this will be done by the append regardless and __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
// the regex test will do this transparently behind the scenes, causing issues if
// an object's to string has escaped characters in it.
string = string.toString();
if(!possible.test(string)) { return string; } function template(templateSpec, env) {
return string.replace(badChars, escapeChar); if (!env) {
}, throw new Exception("No environment passed to template");
}
isEmpty: function(value) { // Note: Using env.VM references rather than local var references throughout this section to allow
if (!value && value !== 0) { // for external users to override these as psuedo-supported APIs.
return true; var invokePartialWrapper = function(partial, name, context, helpers, partials, data) {
} else if(toString.call(value) === "[object Array]" && value.length === 0) { var result = env.VM.invokePartial.apply(this, arguments);
return true; if (result != null) { return result; }
if (env.compile) {
var options = { helpers: helpers, partials: partials, data: data };
partials[name] = env.compile(partial, { data: data !== undefined }, env);
return partials[name](context, options);
} else { } else {
return false; throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
} }
} };
};
;
// lib/handlebars/runtime.js
Handlebars.VM = {
template: function(templateSpec) {
// Just add water // Just add water
var container = { var container = {
escapeExpression: Handlebars.Utils.escapeExpression, escapeExpression: Utils.escapeExpression,
invokePartial: Handlebars.VM.invokePartial, invokePartial: invokePartialWrapper,
programs: [], programs: [],
program: function(i, fn, data) { program: function(i, fn, data) {
var programWrapper = this.programs[i]; var programWrapper = this.programs[i];
if(data) { if(data) {
programWrapper = Handlebars.VM.program(i, fn, data); programWrapper = program(i, fn, data);
} else if (!programWrapper) { } else if (!programWrapper) {
programWrapper = this.programs[i] = Handlebars.VM.program(i, fn); programWrapper = this.programs[i] = program(i, fn);
} }
return programWrapper; return programWrapper;
}, },
merge: function(param, common) { merge: function(param, common) {
var ret = param || common; var ret = param || common;
if (param && common) { if (param && common && (param !== common)) {
ret = {}; ret = {};
Handlebars.Utils.extend(ret, common); Utils.extend(ret, common);
Handlebars.Utils.extend(ret, param); Utils.extend(ret, param);
} }
return ret; return ret;
}, },
programWithDepth: Handlebars.VM.programWithDepth, programWithDepth: env.VM.programWithDepth,
noop: Handlebars.VM.noop, noop: env.VM.noop,
compilerInfo: null compilerInfo: null
}; };
return function(context, options) { return function(context, options) {
options = options || {}; options = options || {};
var result = templateSpec.call(container, Handlebars, context, options.helpers, options.partials, options.data); var namespace = options.partial ? options : env,
helpers,
var compilerInfo = container.compilerInfo || [], partials;
compilerRevision = compilerInfo[0] || 1,
currentRevision = Handlebars.COMPILER_REVISION;
if (compilerRevision !== currentRevision) { if (!options.partial) {
if (compilerRevision < currentRevision) { helpers = options.helpers;
var runtimeVersions = Handlebars.REVISION_CHANGES[currentRevision], partials = options.partials;
compilerVersions = Handlebars.REVISION_CHANGES[compilerRevision];
throw "Template was precompiled with an older version of Handlebars than the current runtime. "+
"Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").";
} else {
// Use the embedded version info since the runtime doesn't know about this revision yet
throw "Template was precompiled with a newer version of Handlebars than the current runtime. "+
"Please update your runtime to a newer version ("+compilerInfo[1]+").";
} }
var result = templateSpec.call(
container,
namespace, context,
helpers,
partials,
options.data);
if (!options.partial) {
env.VM.checkRevision(container.compilerInfo);
} }
return result; return result;
}; };
}, }
programWithDepth: function(i, fn, data /*, $depth */) { __exports__.template = template;function programWithDepth(i, fn, data /*, $depth */) {
var args = Array.prototype.slice.call(arguments, 3); var args = Array.prototype.slice.call(arguments, 3);
var program = function(context, options) { var prog = function(context, options) {
options = options || {}; options = options || {};
return fn.apply(this, [context, options.data || data].concat(args)); return fn.apply(this, [context, options.data || data].concat(args));
}; };
program.program = i; prog.program = i;
program.depth = args.length; prog.depth = args.length;
return program; return prog;
}, }
program: function(i, fn, data) {
var program = function(context, options) { __exports__.programWithDepth = programWithDepth;function program(i, fn, data) {
var prog = function(context, options) {
options = options || {}; options = options || {};
return fn(context, options.data || data); return fn(context, options.data || data);
}; };
program.program = i; prog.program = i;
program.depth = 0; prog.depth = 0;
return program; return prog;
}, }
noop: function() { return ""; },
invokePartial: function(partial, name, context, helpers, partials, data) { __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data) {
var options = { helpers: helpers, partials: partials, data: data }; var options = { partial: true, helpers: helpers, partials: partials, data: data };
if(partial === undefined) { if(partial === undefined) {
throw new Handlebars.Exception("The partial " + name + " could not be found"); throw new Exception("The partial " + name + " could not be found");
} else if(partial instanceof Function) { } else if(partial instanceof Function) {
return partial(context, options); return partial(context, options);
} else if (!Handlebars.compile) {
throw new Handlebars.Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
} else {
partials[name] = Handlebars.compile(partial, {data: data !== undefined});
return partials[name](context, options);
} }
} }
};
Handlebars.template = Handlebars.VM.template; __exports__.invokePartial = invokePartial;function noop() { return ""; }
;
// lib/handlebars/browser-suffix.js __exports__.noop = noop;
if (typeof module === 'object' && module.exports) { return __exports__;
// CommonJS })(__module2__, __module4__, __module1__);
module.exports = Handlebars;
// handlebars.runtime.js
var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
"use strict";
var __exports__;
/*globals Handlebars: true */
var base = __dependency1__;
// Each of these augment the Handlebars object. No need to setup here.
// (This is done to easily share code between commonjs and browse envs)
var SafeString = __dependency2__;
var Exception = __dependency3__;
var Utils = __dependency4__;
var runtime = __dependency5__;
// For compatibility and usage outside of module systems, make the Handlebars object a namespace
var create = function() {
var hb = new base.HandlebarsEnvironment();
Utils.extend(hb, base);
hb.SafeString = SafeString;
hb.Exception = Exception;
hb.Utils = Utils;
hb.VM = runtime;
hb.template = function(spec) {
return runtime.template(spec, hb);
};
return hb;
};
} else if (typeof define === "function" && define.amd) { var Handlebars = create();
// AMD modules Handlebars.create = create;
define(function() { return Handlebars; });
} else { __exports__ = Handlebars;
// other, i.e. browser return __exports__;
this.Handlebars = Handlebars; })(__module1__, __module3__, __module4__, __module2__, __module5__);
}
}).call(this); return __module0__;
; })();

File diff suppressed because one or more lines are too long

@ -0,0 +1,6 @@
define([], function () {
'use strict';
return window.Handlebars;
});

@ -5,7 +5,7 @@ require.config({
'backbone' : 'JsLibraries/backbone', 'backbone' : 'JsLibraries/backbone',
'moment' : 'JsLibraries/moment', 'moment' : 'JsLibraries/moment',
'filesize' : 'JsLibraries/filesize', 'filesize' : 'JsLibraries/filesize',
'handlebars' : 'JsLibraries/handlebars.runtime', 'handlebars' : 'Shared/Shims/handlebars',
'handlebars.helpers' : 'JsLibraries/handlebars.helpers', 'handlebars.helpers' : 'JsLibraries/handlebars.helpers',
'bootstrap' : 'JsLibraries/bootstrap', 'bootstrap' : 'JsLibraries/bootstrap',
'backbone.deepmodel' : 'JsLibraries/backbone.deep.model', 'backbone.deepmodel' : 'JsLibraries/backbone.deep.model',

@ -13,14 +13,14 @@
<link href="/Content/Messenger/messenger.flat.css" rel='stylesheet' type='text/css'/> <link href="/Content/Messenger/messenger.flat.css" rel='stylesheet' type='text/css'/>
<link href="/Content/fullcalendar.css" rel='stylesheet' type='text/css'> <link href="/Content/fullcalendar.css" rel='stylesheet' type='text/css'>
<link href="/Content/theme.css" rel='stylesheet' type='text/css'/> <link href="/Content/theme.css" rel='stylesheet' type='text/css'/>
<link href="/Cells/cells.css" rel='stylesheet' type='text/css'> <link href="/Content/cells.css" rel='stylesheet' type='text/css'>
<link href="/Series/series.css" rel='stylesheet' type='text/css'/> <link href="/Content/series.css" rel='stylesheet' type='text/css'/>
<link href="/History/history.css" rel='stylesheet' type='text/css'/> <link href="/Content/history.css" rel='stylesheet' type='text/css'/>
<link href="/System/Logs/logs.css" rel='stylesheet' type='text/css'/> <link href="/Content/logs.css" rel='stylesheet' type='text/css'/>
<link href="/Settings/settings.css" rel='stylesheet' type='text/css'/> <link href="/Content/settings.css" rel='stylesheet' type='text/css'/>
<link href="/AddSeries/addSeries.css" rel='stylesheet' type='text/css'/> <link href="/Content/addSeries.css" rel='stylesheet' type='text/css'/>
<link href="/Calendar/calendar.css" rel='stylesheet' type='text/css'/> <link href="/Content/calendar.css" rel='stylesheet' type='text/css'/>
<link href="/System/Update/update.css" rel='stylesheet' type='text/css'/> <link href="/Content/update.css" rel='stylesheet' type='text/css'/>
<link href="/Content/overrides.css" rel='stylesheet' type='text/css'/> <link href="/Content/overrides.css" rel='stylesheet' type='text/css'/>
<link rel="apple-touch-icon" href="/Content/Images/touch/57.png?v=2"/> <link rel="apple-touch-icon" href="/Content/Images/touch/57.png?v=2"/>
@ -80,6 +80,7 @@
</script> </script>
<script src="/polyfills.js"></script> <script src="/polyfills.js"></script>
<script src="/JsLibraries/handlebars.runtime.js"></script>
<script data-main="/main" src="/JsLibraries/require.js"></script> <script data-main="/main" src="/JsLibraries/require.js"></script>
<script src="/JsLibraries/xrayquire.js"></script> <script src="/JsLibraries/xrayquire.js"></script>
</html> </html>

Loading…
Cancel
Save