Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/AdFabConnect/abejs
Browse files Browse the repository at this point in the history
  • Loading branch information
gregorybesson committed Aug 26, 2016
2 parents 38a2801 + d872c57 commit 44c8977
Show file tree
Hide file tree
Showing 10 changed files with 1,043 additions and 1,021 deletions.
6 changes: 2 additions & 4 deletions dist/cli/controllers/Page.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
* Page class
* manage HTML generation for page template
*/

var Page = function () {

/**
Expand All @@ -57,7 +56,6 @@ var Page = function () {
* @param {Boolean} onlyHTML default = false, if true HTML content will contains abe attributs
* @return {String} HTML page as string
*/

function Page(path, text, json) {
var _this = this;

Expand All @@ -77,8 +75,8 @@ var Page = function () {
_handlebars2.default.registerHelper('i18nAbe', _.translate); // HandlebarsJS unique text helper
_handlebars2.default.registerHelper('math', _.math); // HandlebarsJS unique text helper
_handlebars2.default.registerHelper('moduloIf', _.moduloIf); // HandlebarsJS helper for modulo test
_handlebars2.default.registerHelper('testObj', _.testObj); //
_handlebars2.default.registerHelper('attrAbe', _.attrAbe); //
_handlebars2.default.registerHelper('testObj', _.testObj); //
_handlebars2.default.registerHelper('attrAbe', _.attrAbe); //
_handlebars2.default.registerHelper('printJson', _.printJson);
_handlebars2.default.registerHelper('printBlock', _.printBlock);
_handlebars2.default.registerHelper('className', _.className);
Expand Down
6 changes: 3 additions & 3 deletions dist/cli/handlebars/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ var _ifIn = require('./utils/ifIn');

var _ifIn2 = _interopRequireDefault(_ifIn);

var _ifTrue = require('./utils/ifTrue');
var _isTrue = require('./utils/isTrue');

var _ifTrue2 = _interopRequireDefault(_ifTrue);
var _isTrue2 = _interopRequireDefault(_isTrue);

var _math = require('./utils/math');

Expand Down Expand Up @@ -140,7 +140,7 @@ _handlebars2.default.registerHelper('cleanTab', _cleanTab2.default);
_handlebars2.default.registerHelper('slugify', (0, _handlebarsHelperSlugify2.default)({ Handlebars: _handlebars2.default }).slugify);
_handlebars2.default.registerHelper('ifCond', _ifCond2.default);
_handlebars2.default.registerHelper('ifIn', _ifIn2.default);
_handlebars2.default.registerHelper('isTrue', _ifTrue2.default);
_handlebars2.default.registerHelper('isTrue', _isTrue2.default);
_handlebars2.default.registerHelper('math', _math2.default);
_handlebars2.default.registerHelper('moduloIf', _moduloIf2.default);
_handlebars2.default.registerHelper('notEmpty', _notEmpty2.default);
Expand Down
1 change: 0 additions & 1 deletion dist/cli/helpers/file-attr.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ var Attr = function () {
* @param {String} str string to work with
* @return {void}
*/

function Attr(str) {
_classCallCheck(this, Attr);

Expand Down
3 changes: 1 addition & 2 deletions dist/server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,9 @@ if (_cli.config.security === true) {
sandbox: ['allow-same-origin', 'allow-scripts', "allow-modals", 'allow-popups', 'allow-forms'],
reportUri: '/report-violation',
objectSrc: [] },
// An empty array allows nothing through
reportOnly: false, // Set to true if you only want browsers to report errors, not block them
setAllHeaders: false, // Set to true if you want to blindly set all headers: Content-Security-Policy, X-WebKit-CSP, and X-Content-Security-Policy.
disableAndroid: false, // Set to true if you want to disable CSP on Android where it can be buggy.
disableAndroid: false, // Set to true if you want to disable CSP on Android where it can be buggy.
browserSniff: true // Set to false if you want to completely disable any user-agent sniffing. This may make the headers less compatible but it will be much faster. This defaults to `true`.
}));
}
Expand Down
2 changes: 1 addition & 1 deletion dist/server/public/libs/bootstrap.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ if ("undefined" == typeof jQuery) throw new Error("Bootstrap's JavaScript requir
c = this.options;return a = b.attr("data-original-title") || ("function" == typeof c.title ? c.title.call(b[0]) : c.title);
}, c.prototype.getUID = function (a) {
do {
a += ~ ~(1e6 * Math.random());
a += ~~(1e6 * Math.random());
} while (document.getElementById(a));return a;
}, c.prototype.tip = function () {
if (!this.$tip && (this.$tip = a(this.options.template), 1 != this.$tip.length)) throw new Error(this.type + " `template` option must consist of exactly 1 top-level element!");return this.$tip;
Expand Down
2 changes: 1 addition & 1 deletion dist/server/public/libs/jquery-2.1.0.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
b(a[h], c, g ? d : d.call(a[h], h, b(a[h], c)));
}return e ? a : j ? b.call(a) : i ? b(a[0], c) : f;
};o.acceptData = function (a) {
return 1 === a.nodeType || 9 === a.nodeType || ! +a.nodeType;
return 1 === a.nodeType || 9 === a.nodeType || !+a.nodeType;
};function K() {
Object.defineProperty(this.cache = {}, 0, { get: function get() {
return {};
Expand Down
959 changes: 486 additions & 473 deletions dist/server/public/scripts/admin-compiled.js

Large diffs are not rendered by default.

1,073 changes: 543 additions & 530 deletions dist/server/public/scripts/template-engine-compiled.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/tasks/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ var result = sass.render({
outFile: output,
sourceMap: true
}, function (error, result) {
// node-style callback from v3.0.0 onwards
// node-style callback from v3.0.0 onwards
if (!error) {
console.log(clc.green('write sass ' + output));
// No errors during the compilation, write this result on the disk
// No errors during the compilation, write this result on the disk
fs.writeFile(output, result.css, function (err) {
if (!err) {
//file written on disk
//file written on disk
}
});
} else {
console.log(clc.red('ERROR ' + error));
}
console.log(clc.red('ERROR ' + error));
}
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "abe-cli",
"version": "1.7.109",
"version": "1.8.0",
"description": "Abe command line tool",
"main": "src/server/app.js",
"repository": {
Expand Down

0 comments on commit 44c8977

Please sign in to comment.