Skip to content

Commit

Permalink
bug include apache
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolaslabbe committed Aug 31, 2016
1 parent 1b9c0b3 commit d832636
Show file tree
Hide file tree
Showing 12 changed files with 881 additions and 903 deletions.
6 changes: 4 additions & 2 deletions dist/cli/controllers/Page.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
* Page class
* manage HTML generation for page template
*/

var Page = function () {

/**
Expand All @@ -56,6 +57,7 @@ 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 @@ -75,8 +77,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
1 change: 1 addition & 0 deletions dist/cli/helpers/file-attr.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ var Attr = function () {
* @param {String} str string to work with
* @return {void}
*/

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

Expand Down
3 changes: 2 additions & 1 deletion dist/server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,10 @@ 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
819 changes: 403 additions & 416 deletions dist/server/public/scripts/admin-compiled.js

Large diffs are not rendered by default.

933 changes: 460 additions & 473 deletions dist/server/public/scripts/template-engine-compiled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/server/public/scripts/template-engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ var Engine = function () {
var base = comment.data;
if (typeof base !== 'undefined' && base !== null) {
base = base.replace(/\[pageHTML\]/g, '');
base = base.replace(/-- >/g, '-->');
base = base.replace(/<ABE!--/g, '<!--').replace(/--ABE>/g, '-->');
_EditorReload2.default.instance.inject(base);
}
}
Expand Down
2 changes: 1 addition & 1 deletion dist/server/routes/get-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ var route = function route(req, res, next) {
if (typeof _json !== 'undefined' && _json !== null && typeof _json.abe_meta !== 'undefined' && _json.abe_meta !== null) {
var text = (0, _cli.getTemplate)(_json.abe_meta.template);
var page = new _cli.Page(req.params[0], text, _json, false);
pageHtml = page.html.replace(/"/g, '\"').replace(/'/g, "\'");
pageHtml = page.html.replace(/"/g, '\"').replace(/'/g, "\'").replace(/<!--/g, '<ABE!--').replace(/-->/g, '--ABE>');
}

var EditorVariables = {
Expand Down
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 src/server/public/scripts/template-engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class Engine {
var base = comment.data
if(typeof base !== 'undefined' && base !== null) {
base = base.replace(/\[pageHTML\]/g, '')
base = base.replace(/-- >/g, '-->')
base = base.replace(/<ABE!--/g, '<!--',).replace(/--ABE>/g, '-->')
EditorReload.instance.inject(base)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/routes/get-main.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ var route = function(req, res, next) {
&& typeof _json.abe_meta !== 'undefined' && _json.abe_meta !== null) {
var text = getTemplate(_json.abe_meta.template)
var page = new Page(req.params[0], text, _json, false)
pageHtml = page.html.replace(/"/g, '\"').replace(/'/g, "\'")
pageHtml = page.html.replace(/"/g, '\"').replace(/'/g, "\'").replace(/<!--/g, '<ABE!--').replace(/-->/g, '--ABE>')
}

var EditorVariables = {
Expand Down

0 comments on commit d832636

Please sign in to comment.