alchemymvc 1.3.22 → 1.4.0-alpha.2

package/lib/app/helper/pagination_helper.js

@@ -1,7 +1,7 @@
 /**
  * The pagination helper
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
@@ -14,11 +14,11 @@ var Pagination = Function.inherits('Alchemy.Helper', function Pagination(view) {
 /**
  * Return pagination config
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.4
  *
- * @param    {String}   name
+ * @param    {string}   name
  *
  * @return   {Object}
  */
@@ -52,7 +52,7 @@ Pagination.setMethod(function getConfig(name) {
 
 /**
  * Default options for getInfo
- * @type   {Object}
+ * @type     {Object}
  */
 Pagination.setProperty('default_get_info', {
 	showing: 'Showing',
@@ -64,7 +64,7 @@ Pagination.setProperty('default_get_info', {
 /**
  * Is there a next page?
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  0.4.1
  */
@@ -83,11 +83,11 @@ Pagination.setMethod(function hasNext(name) {
 /**
  * Return info
  *
- * @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    {Object}   options
  */
 Pagination.setMethod(function getInfo(name, options) {
@@ -144,11 +144,11 @@ Pagination.setMethod(function getInfo(name, options) {
 /**
  * Return the current page number
  *
- * @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
  */
 Pagination.setMethod(function getPageNumber(name) {
 
@@ -162,11 +162,11 @@ Pagination.setMethod(function getPageNumber(name) {
 /**
  * Return the available pages
  *
- * @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
  */
 Pagination.setMethod(function getPages(name) {
 
@@ -180,11 +180,11 @@ Pagination.setMethod(function getPages(name) {
 /**
  * Return the total available items
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  */
 Pagination.setMethod(function getTotalItems(name) {
 
@@ -198,11 +198,11 @@ Pagination.setMethod(function getTotalItems(name) {
 /**
  * Return the first-of-page number
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  */
 Pagination.setMethod(function getFirstOfPage(name) {
 
@@ -223,11 +223,11 @@ Pagination.setMethod(function getFirstOfPage(name) {
 /**
  * Return the last-of-page number
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  */
 Pagination.setMethod(function getLastOfPage(name) {
 
@@ -255,7 +255,7 @@ Pagination.setMethod(function getLastOfPage(name) {
 /**
  * Print an arrow link (Up or down)
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.2.0
  *
@@ -283,7 +283,7 @@ Pagination.setMethod(function arrowLink(options) {
 /**
  * Print a link to the next page
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.2.0
  *
@@ -305,7 +305,7 @@ Pagination.setMethod(function next(options) {
 /**
  * Print a link to the previous page
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.2.0
  *
@@ -326,7 +326,7 @@ Pagination.setMethod(function previous(options) {
 
 /**
  * Default options for page
- * @type   {Object}
+ * @type     {Object}
  */
 Pagination.setProperty('default_page', {
 	skip_empty: false,
@@ -338,7 +338,7 @@ Pagination.setProperty('default_page', {
 /**
  * Print a link to a certain page
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.0.0
  *
@@ -455,11 +455,11 @@ Pagination.setMethod(function page(options) {
 /**
  * Print out the numbers
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  0.2.0
  *
- * @param    {String}   name   The model we're paginating. Optional.
+ * @param    {string}   name   The model we're paginating. Optional.
  */
 Pagination.setMethod(function show(name, options) {
 
@@ -545,13 +545,13 @@ Pagination.setMethod(function show(name, options) {
  * Create an anchor that will sort the pagination on the given field.
  * The first argument can also be an object, which supports more features.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.0.0
  *
- * @param    {String}   paginationName   The model we're paginating.
- * @param    {String}   fieldName        The field we're sorting.
- * @param    {String}   content          The text to show in the anchor.
+ * @param    {string}   paginationName   The model we're paginating.
+ * @param    {string}   fieldName        The field we're sorting.
+ * @param    {string}   content          The text to show in the anchor.
  */
 Pagination.setMethod(function sort(paginationName, fieldName, content) {
 
@@ -615,13 +615,13 @@ Pagination.setMethod(function sort(paginationName, fieldName, content) {
 /**
  * Create an input to filter this row.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.0.4
  *
- * @param    {String}   paginationName   The model we're paginating.
- * @param    {String}   fieldName        The field we're sorting.
- * @param    {String}   content          The text to show in the input.
+ * @param    {string}   paginationName   The model we're paginating.
+ * @param    {string}   fieldName        The field we're sorting.
+ * @param    {string}   content          The text to show in the input.
  */
 Pagination.setMethod(function filter(paginationName, fieldName, content) {
 
@@ -667,11 +667,11 @@ Pagination.setMethod(function filter(paginationName, fieldName, content) {
 /**
  * Create an apply button
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  0.5.0
  *
- * @param    {String}   paginationName   The model we're paginating.
+ * @param    {string}   paginationName   The model we're paginating.
  */
 Pagination.setMethod(function applyButton(paginationName) {
 
@@ -698,7 +698,7 @@ Pagination.setMethod(function applyButton(paginationName) {
 /**
  * Apply the filter
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  1.0.4
  */
@@ -746,7 +746,7 @@ Pagination.setMethod(function _apply(element, change_focus, callback) {
 /**
  * Create an input to filter this row.
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.0.1
  * @version  1.0.4
  */

package/lib/app/helper/router_helper.js

@@ -1,7 +1,7 @@
 /**
  * The router helper
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.0.0
  *
@@ -14,7 +14,7 @@ var Router = Function.inherits('Alchemy.Helper', function Router(renderer) {
 /**
  * Also make it available under the Route name
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.1.0
  *
@@ -27,7 +27,7 @@ var Route = Function.inherits('Alchemy.Helper.Router', function Route(renderer)
 /**
  * Get the current url we're on
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.2.5
  *
@@ -49,7 +49,7 @@ Router.setProperty(function current_url() {
 /**
  * Get the current riyte we're on
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.10
  * @version  1.3.10
  *
@@ -73,13 +73,13 @@ Router.setProperty(function current_route() {
 /**
  * Check if the given URL is a local one
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.3.0
- * @version  1.3.0
+ * @version  1.4.0
  *
- * @param    {String|RURL}    url
+ * @param    {string|RURL}    url
  *
- * @return   {Boolean}
+ * @return   {boolean}
  */
 Router.setMethod(function isLocalUrl(url) {
 
@@ -89,9 +89,9 @@ Router.setMethod(function isLocalUrl(url) {
 		return true;
 	}
 
-	if (Blast.isNode && alchemy.settings.url) {
+	if (Blast.isNode && alchemy.settings.network.main_url) {
 		// @TODO: Would be nice to not have to parse this every time
-		let server_url = RURL.parse(alchemy.settings.url);
+		let server_url = RURL.parse(alchemy.settings.network.main_url);
 
 		if (server_url.hostname == url.hostname) {
 			return true;
@@ -110,12 +110,12 @@ Router.setMethod(function isLocalUrl(url) {
 /**
  * Apply directive to an element
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.1.0
  * @version  1.3.1
  *
  * @param    {Element}   element    The element to apply to
- * @param    {String}    name       The route name
+ * @param    {string}    name       The route name
  * @param    {Object}    options
  *
  * @return   {Object}
@@ -270,12 +270,12 @@ Router.setMethod(function applyDirective(element, name, options) {
 /**
  * Return route name info
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.3.7
  *
- * @param    {String}   name
- * @param    {Boolean}  socket_route   Look in the socket routes
+ * @param    {string}   name
+ * @param    {boolean}  socket_route   Look in the socket routes
  *
  * @return   {Object}
  */
@@ -373,11 +373,11 @@ Router.setMethod(function routeConfig(name, socket_route) {
 /**
  * Return the plain url for the given url name & parameters object
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
- * @version  1.3.10
+ * @version  1.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  *
  * @return   {RURL}
@@ -528,7 +528,7 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 			if (Blast.isBrowser) {
 				base_url = RURL.parse(window.location);
 			} else {
-				base_url = RURL.parse(alchemy.settings.url);
+				base_url = RURL.parse(alchemy.settings.network.main_url);
 			}
 		}
 
@@ -549,11 +549,11 @@ Router.setMethod(function routeUrl(name, parameters, options) {
 /**
  * Get a route's trail
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  1.3.8
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  * @param    {Object}   options
  *
@@ -625,7 +625,7 @@ Router.setMethod(function getTrail(name, parameters, options) {
 /**
  * Print a breadcrumb trail
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  */
@@ -636,7 +636,7 @@ Router.setMethod(function printBreadcrumb() {
 /**
  * Set breadcrumb info, if it hasn't happened yet during this render
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.3.0
  * @version  0.3.0
  *
@@ -654,11 +654,11 @@ Router.setMethod(function setBreadcrumb(entries) {
 /**
  * Print out an anchor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.2.0
  * @version  1.1.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  */
 Router.setMethod(function printRoute(name, parameters, options) {
@@ -674,7 +674,7 @@ Router.setMethod(function printRoute(name, parameters, options) {
 /**
  * Close the current open route
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.5.0
  * @version  0.5.0
  */
@@ -691,11 +691,11 @@ Router.setMethod(function closeRoute() {
 /**
  * Return the route anchor
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.0
  * @version  0.4.0
  *
- * @param    {String}   name
+ * @param    {string}   name
  * @param    {Object}   parameters
  */
 Router.setMethod(function getAnchor(name, parameters, options) {
@@ -782,7 +782,7 @@ Router.setMethod(function getAnchor(name, parameters, options) {
 /**
  * Get the current route variables
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.2.5
  *
@@ -810,7 +810,7 @@ Router.setMethod(function getRouteVariables() {
 /**
  * Update language switcher info
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.0
  *
@@ -837,11 +837,11 @@ Router.setMethod(function updateLanguageSwitcher(element, variables) {
 /**
  * Get a translated URL for the current route
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.8
  *
- * @param    {String}   prefix    The prefix to use
+ * @param    {string}   prefix    The prefix to use
  * @param    {Object}   variables
  */
 Router.setMethod(function translateCurrentRoute(prefix, variables) {
@@ -911,12 +911,12 @@ Router.setMethod(function translateCurrentRoute(prefix, variables) {
 /**
  * Turn the given element into a language switcher
  *
- * @author   Jelle De Loecker   <jelle@elevenways.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    1.2.5
  * @version  1.3.0
  *
  * @param    {Element}   element    The element to apply to
- * @param    {String}    language   The actual language
+ * @param    {string}    language   The actual language
  * @param    {Object}    options
  */
 Router.setMethod(function languageSwitcherDirective(element, language, options) {
@@ -932,7 +932,7 @@ Router.setMethod(function languageSwitcherDirective(element, language, options)
 /**
  * The switch language element
  *
- * @author   Jelle De Loecker   <jelle@develry.be>
+ * @author   Jelle De Loecker <jelle@elevenways.be>
  * @since    0.4.1
  * @version  1.1.0
  */