alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/app/helper_controller/conduit.js

@@ -4,7 +4,7 @@
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.3
  */
@@ -32,7 +32,7 @@ var Conduit = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Conduit',
 /**
  * Handle a local url
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.2.2
  *
@@ -202,7 +202,7 @@ Conduit.setStatic(function handleUrlLocal(url, options) {
 /**
  * When this response was sent
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  */
@@ -211,7 +211,7 @@ Conduit.setProperty('ended', false);
 /**
  * The "body" property
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  */
@@ -230,7 +230,7 @@ Conduit.setProperty(function body() {
 /**
  * The "view_render" property
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  */
@@ -241,7 +241,7 @@ Conduit.setProperty(function view_render() {
 /**
  * The "renderer" property
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.5
  */
@@ -269,7 +269,7 @@ Conduit.setProperty(function renderer() {
 /**
  * Throw an error when a conduit is checksummed
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  */
@@ -280,11 +280,11 @@ Conduit.setMethod(Blast.checksumSymbol, function toChecksum() {
 /**
  * Get a parameter from the route, post or get query or cookie
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value   Overrides the value if set
  */
 Conduit.setMethod(function param(name, value) {
@@ -325,11 +325,11 @@ Conduit.setMethod(function param(name, value) {
 /**
  * Set a variable for ViewRender
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Conduit.setMethod(function set(name, value) {
@@ -344,11 +344,11 @@ Conduit.setMethod(function set(name, value) {
 /**
  * Set an internal variable for ViewRender
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Conduit.setMethod(function internal(name, value) {
@@ -363,11 +363,11 @@ Conduit.setMethod(function internal(name, value) {
 /**
  * Expose a variable for ViewRender
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Conduit.setMethod(function expose(name, value) {
@@ -382,13 +382,13 @@ Conduit.setMethod(function expose(name, value) {
 /**
  * Get the best locale to use for this connection
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
  * @param    {Array}   locales   Locales to choose from
  *
- * @return   {String}
+ * @return   {string}
  */
 Conduit.setMethod(function chooseBestLocale(locales) {
 
@@ -408,13 +408,13 @@ Conduit.setMethod(function chooseBestLocale(locales) {
 /**
  * Check if this request has a permission
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
- * @param    {String}    permission
+ * @param    {string}    permission
  *
- * @return   {Boolean}   True if the user has the permission, false otherwise
+ * @return   {boolean}   True if the user has the permission, false otherwise
  */
 Conduit.setMethod(function hasPermission(permission) {
 
@@ -432,11 +432,11 @@ if (Blast.isNode) {
 /**
  * End the call
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value   Overrides the value if set
  */
 Conduit.setMethod(function end(message) {
@@ -451,11 +451,11 @@ Conduit.setMethod(function end(message) {
 /**
  * Get/set cookies
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value   Overrides the value if set
  */
 Conduit.setMethod(function cookie(name, value) {
@@ -465,11 +465,11 @@ Conduit.setMethod(function cookie(name, value) {
 /**
  * Throw an error
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @param    {Number}  status       Response statuscode
+ * @param    {number}  status       Response statuscode
  * @param    {Error}   message      Optional error to send
  */
 Conduit.setMethod(function error(status, message) {
@@ -484,12 +484,12 @@ Conduit.setMethod(function error(status, message) {
 /**
  * Local redirect
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
- * @param    {Number}          status    3xx redirection codes. 302 (temporary redirect) by default
- * @param    {String|Object}   options   Options or url
+ * @param    {number}          status    3xx redirection codes. 302 (temporary redirect) by default
+ * @param    {string|Object}   options   Options or url
  */
 Conduit.setMethod(async function redirect(status, options) {
 
@@ -515,7 +515,7 @@ Conduit.setMethod(async function redirect(status, options) {
 /**
  * Get the alchemy routes, compile paths
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
@@ -554,7 +554,7 @@ Hawkejs.Scene.setMethod(function getAlchemyRoutes() {
 /**
  * Intercept Scene#openUrl calls
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  *

package/lib/app/helper_controller/controller.js

@@ -4,7 +4,7 @@
  *
  * @constructor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  */
@@ -16,7 +16,7 @@ var Controller = Function.inherits('Alchemy.Client.Base', 'Alchemy.Client.Contro
 /**
  * Map these events to methods
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.1
  * @version  1.1.1
  */
@@ -29,7 +29,7 @@ Controller.mapEventToMethod({
 /**
  * Add action object
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  */
@@ -46,7 +46,7 @@ Controller.constitute(function addActions() {
 /**
  * Add an action
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  */
@@ -89,14 +89,14 @@ Controller.setStatic(function setAction(name, fnc, on_server) {
 /**
  * Object where components are stored
  *
- * @type {Object}
+ * @type     {Object}
  */
 Controller.prepareProperty('components', Object);
 
 /**
  * The controller name
  *
- * @type {String}
+ * @type     {string}
  */
 Controller.prepareProperty('name', function name() {
 	return this.constructor.name;
@@ -105,7 +105,7 @@ Controller.prepareProperty('name', function name() {
 /**
  * The model linked to this controller
   *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.5
  *
@@ -123,7 +123,7 @@ Controller.prepareProperty(function model() {
 /**
  * Alias to the viewRender
  *
- * @type {Hawkejs.ViewRender}
+ * @type     {Hawkejs.ViewRender}
  */
 Controller.setProperty(function view_render() {
 	return this.conduit.view_render;
@@ -132,11 +132,11 @@ Controller.setProperty(function view_render() {
 /**
  * Enable a component
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.0.0
  *
- * @param    {String}   name     The name of the component
+ * @param    {string}   name     The name of the component
  * @param    {Object}   options
  */
 Controller.setMethod(function addComponent(name, options) {
@@ -162,11 +162,11 @@ Controller.setMethod(function addComponent(name, options) {
 /**
  * Change the response URL (or disable it)
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
  * @version  1.3.0
  *
- * @param    {String|RURL|Boolean}   new_url
+ * @param    {string|RURL|boolean}   new_url
  */
 Controller.setMethod(function setResponseUrl(new_url) {
 
@@ -179,11 +179,11 @@ Controller.setMethod(function setResponseUrl(new_url) {
 /**
  * Set a variable for ViewRender, through conduit
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  0.2.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Controller.setMethod(function set(name, value) {
@@ -198,11 +198,11 @@ Controller.setMethod(function set(name, value) {
 /**
  * Set a variable for ViewRender, encode HTML if it's a string
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  0.4.1
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Controller.setMethod(function safeSet(name, value) {
@@ -221,11 +221,11 @@ Controller.setMethod(function safeSet(name, value) {
 /**
  * Set the page title
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  0.4.1
  *
- * @param    {String}   title
+ * @param    {string}   title
  */
 Controller.setMethod(function setTitle(title) {
 	this.set('pagetitle', title);
@@ -235,11 +235,11 @@ Controller.setMethod(function setTitle(title) {
 /**
  * Set an internal variable for ViewRender
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Controller.setMethod(function internal(name, value) {
@@ -254,11 +254,11 @@ Controller.setMethod(function internal(name, value) {
 /**
  * Expose a variable for ViewRender
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Mixed}    value
  */
 Controller.setMethod(function expose(name, value) {
@@ -273,12 +273,12 @@ Controller.setMethod(function expose(name, value) {
 /**
  * Render the given template
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.0
  * @version  1.1.0
  *
- * @param   {Number}   status
- * @param   {Array}    templates
+ * @param    {number}   status
+ * @param    {Array}    templates
  */
 Controller.setMethod(function render(status, templates) {
 
@@ -309,11 +309,11 @@ Controller.setMethod(function render(status, templates) {
 /**
  * End the response
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
- * @param    {String|Object}   message
+ * @param    {string|Object}   message
  */
 Controller.setMethod(function end(message) {
 	return this.conduit.end(message);
@@ -322,12 +322,12 @@ Controller.setMethod(function end(message) {
 /**
  * Perform the wanted action and fire expected events
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.0
+ * @version  1.4.0
  *
- * @param   {String}   name   The name of the action to execute
- * @param   {Array}    args   Arguments to apply to the action
+ * @param    {string}   name   The name of the action to execute
+ * @param    {Array}    args   Arguments to apply to the action
  */
 Controller.setMethod(async function doAction(name, args) {
 
@@ -362,8 +362,8 @@ Controller.setMethod(async function doAction(name, args) {
 			// @TODO: Add support for objects with language keys
 			let title = route.options.title;
 
-			if (alchemy.settings && alchemy.settings.title_suffix) {
-				title += alchemy.settings.title_suffix;
+			if (alchemy.settings && alchemy.settings.frontend.title_suffix) {
+				title += alchemy.settings.frontend.title_suffix;
 			}
 
 			this.setTitle(title);
@@ -384,9 +384,24 @@ Controller.setMethod(async function doAction(name, args) {
 	}
 
 	try {
-		await this.issueEvent('initializing');
-		await this.issueEvent('filtering');
-		await this.issueEvent('starting', [name]);
+		let result = await this.issueEvent('initializing');
+
+		if (result === false) {
+			return;
+		}
+
+		result = await this.issueEvent('filtering');
+
+		if (result === false) {
+			return;
+		}
+
+		result = await this.issueEvent('starting', [name]);
+
+		if (result === false) {
+			return;
+		}
+
 		await this.constructor.actions[name].apply(this, args);
 	} catch (err) {
 		this.conduit.error(err);
@@ -396,11 +411,11 @@ Controller.setMethod(async function doAction(name, args) {
 /**
  * Create client controller class for specific controller name
  *
- * @author   Jelle De Loecker <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.0.5
  * @version  1.0.5
  *
- * @param    {String}   controller_name
+ * @param    {string}   controller_name
  */
 Controller.setStatic(function getClass(controller_name) {
 
@@ -423,7 +438,7 @@ Controller.setStatic(function getClass(controller_name) {
 
 	if (ControllerClass == null) {
 		model_constructor = Function.create(class_name, function ControllerConstructor(record, options) {
-			ControllerConstructor.wrapper.super.call(this, record, options);
+			ControllerConstructor.super.call(this, record, options);
 		});
 
 		// @TODO: inherit from parents