rbbt-rest 1.8.42 → 1.8.43

data/share/views/public/plugins/semantic-ui/examples/bootstrap.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Bootstrap - Semantic</title>
   <link rel="stylesheet" type="text/css" href="../dist/semantic.css">
 
@@ -106,13 +106,13 @@
             <i class="dropdown icon"></i>
             <span class="text">Clothing</span>
             <div class="menu">
-              <div class="header">Mens</div>
+              <div class="header">Men's</div>
               <div class="item">Shirts</div>
               <div class="item">Pants</div>
               <div class="item">Jeans</div>
               <div class="item">Shoes</div>
               <div class="divider"></div>
-              <div class="header">Womens</div>
+              <div class="header">Women's</div>
               <div class="item">Dresses</div>
               <div class="item">Shoes</div>
               <div class="item">Bags</div>
@@ -409,7 +409,7 @@
         </div>
         <div class="column">
           <h4 class="ui top attached inverted header">Header</h4>
-          <div class="ui buttom attached segment">Panel content</div>
+          <div class="ui bottom attached segment">Panel content</div>
         </div>
         <div class="column">
           <h4 class="ui top attached block header">Header</h4>

data/share/views/public/plugins/semantic-ui/examples/components/site.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Theming - Semantic</title>
   <link rel="stylesheet" type="text/css" href="../../dist/components/reset.css">
   <link rel="stylesheet" type="text/css" href="../../dist/components/site.css">

data/share/views/public/plugins/semantic-ui/examples/fixed.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Fixed Menu Example - Semantic</title>
 
   <link rel="stylesheet" type="text/css" href="../dist/components/reset.css">
@@ -48,29 +48,29 @@
 
   <div class="ui fixed inverted menu">
     <div class="ui container">
-      <div href="#" class="header item">
+      <a href="#" class="header item">
         <img class="logo" src="assets/images/logo.png">
         Project Name
-      </div>
+      </a>
       <a href="#" class="item">Home</a>
-      <a href="#" class="ui simple dropdown item">
+      <div class="ui simple dropdown item">
         Dropdown <i class="dropdown icon"></i>
         <div class="menu">
-          <div class="item">Link Item</div>
-          <div class="item">Link Item</div>
+          <a class="item" href="#">Link Item</a>
+          <a class="item" href="#">Link Item</a>
           <div class="divider"></div>
           <div class="header">Header Item</div>
           <div class="item">
             <i class="dropdown icon"></i>
             Sub Menu
             <div class="menu">
-              <div class="item">Link Item</div>
-              <div class="item">Link Item</div>
+              <a class="item" href="#">Link Item</a>
+              <a class="item" href="#">Link Item</a>
             </div>
           </div>
-          <div class="item">Link Item</div>
+          <a class="item" href="#">Link Item</a>
         </div>
-      </a>
+      </div>
     </div>
   </div>
 

data/share/views/public/plugins/semantic-ui/examples/grid.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Grid Example - Semantic</title>
 
   <link rel="stylesheet" type="text/css" href="../dist/components/reset.css">

data/share/views/public/plugins/semantic-ui/examples/homepage.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Homepage - Semantic</title>
   <link rel="stylesheet" type="text/css" href="../dist/components/reset.css">
   <link rel="stylesheet" type="text/css" href="../dist/components/site.css">
@@ -201,7 +201,7 @@
       <h1 class="ui inverted header">
         Imagine-a-Company
       </h1>
-      <h2>Do whatever you want when you want to.</p>
+      <h2>Do whatever you want when you want to.</h2>
       <div class="ui huge primary button">Get Started <i class="right arrow icon"></i></div>
     </div>
 
@@ -255,7 +255,7 @@
         <a href="#">Case Studies</a>
       </h4>
       <h3 class="ui header">Did We Tell You About Our Bananas?</h3>
-      <p>Yes I know you probably disregarded the earlier boasts as non-sequitor filler content, but its really true. It took years of gene splicing and combinatory DNA research, but our bananas can really dance.</p>
+      <p>Yes I know you probably disregarded the earlier boasts as non-sequitur filler content, but its really true. It took years of gene splicing and combinatory DNA research, but our bananas can really dance.</p>
       <a class="ui large button">I'm Still Quite Interested</a>
     </div>
   </div>

data/share/views/public/plugins/semantic-ui/examples/login.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Login Example - Semantic</title>
   <link rel="stylesheet" type="text/css" href="../dist/components/reset.css">
   <link rel="stylesheet" type="text/css" href="../dist/components/site.css">

data/share/views/public/plugins/semantic-ui/examples/responsive.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Responsive Elements - Semantic</title>
   <link rel="stylesheet" type="text/css" href="../dist/semantic.css">
 
@@ -336,8 +336,8 @@
   </div>
 </div>
 
-<h3 class="ui center aligned header">Celled Doubling Stackable Grid</h3>
-<div class="doubling stackable celled ui grid container">
+<h3 class="ui center aligned header">Celled Stackable Grid</h3>
+<div class="ui stackable celled grid container">
   <div class="two column row">
     <div class="column">
       <div class="ui segment">Content</div>
@@ -670,7 +670,7 @@ $(document).ready(function() {
       // fire once each time passed
       once: false,
 
-      // dont refresh position on resize
+      // don't refresh position on resize
       checkOnRefresh: true,
 
       // lock to this element on resize
@@ -686,4 +686,4 @@ $(document).ready(function() {
 </script>
 
 </body>
-</htmL.
+</html>

data/share/views/public/plugins/semantic-ui/examples/sticky.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Sticky Example - Semantic</title>
 
   <link rel="stylesheet" type="text/css" href="../dist/components/reset.css">

data/share/views/public/plugins/semantic-ui/examples/theming.html

@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
 
-  <!-- Site Properities -->
+  <!-- Site Properties -->
   <title>Theming - Semantic</title>
   <link rel="stylesheet" type="text/css" href="../dist/semantic.css">
 

data/share/views/public/plugins/semantic-ui/gulpfile.js

@@ -74,11 +74,11 @@ gulp.task('build-docs', 'Build all files and add to SUI Docs', buildDocs);
 ---------------*/
 
 if(config.rtl) {
-  gulp.task('watch-rtl', 'Build all files as RTL', watchRTL);
-  gulp.task('build-rtl', 'Watch files as RTL ', buildRTL);
+  gulp.task('watch-rtl', 'Watch files as RTL', watchRTL);
+  gulp.task('build-rtl', 'Build all files as RTL', buildRTL);
 }
 
 /* Admin Tasks */
 if(config.admin) {
   require('./tasks/collections/admin')(gulp);
-}
+}

data/share/views/public/plugins/semantic-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semantic-ui",
-  "version": "2.0.0",
+  "version": "2.2.6",
   "title": "Semantic UI",
   "description": "Semantic empowers designers and developers by creating a shared vocabulary for UI.",
   "homepage": "http://www.semantic-ui.com",
@@ -23,16 +23,17 @@
     "gulp": "*",
     "gulp-autoprefixer": "*",
     "gulp-chmod": "*",
+    "gulp-clean-css": "*",
     "gulp-clone": "*",
     "gulp-concat": "*",
     "gulp-concat-css": "*",
     "gulp-copy": "*",
+    "gulp-dedupe": "*",
     "gulp-flatten": "*",
     "gulp-header": "*",
     "gulp-help": "*",
     "gulp-if": "*",
     "gulp-less": "*",
-    "gulp-minify-css": "*",
     "gulp-notify": "*",
     "gulp-plumber": "*",
     "gulp-print": "*",
@@ -44,50 +45,54 @@
     "gulp-watch": "*",
     "map-stream": "*",
     "require-dot-file": "*",
+    "run-sequence": "*",
     "yamljs": "*"
   },
   "dependencies": {
     "better-console": "*",
-    "del": "^1.2.0",
-    "extend": "^2.0.1",
-    "gulp": "^3.9.0",
-    "gulp-autoprefixer": "^2.3.1",
-    "gulp-chmod": "^1.2.0",
+    "del": "^2.2.0",
+    "extend": "^3.0.0",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^3.1.0",
+    "gulp-chmod": "^1.3.0",
     "gulp-clone": "^1.0.0",
     "gulp-concat": "^2.6.0",
     "gulp-concat-css": "^2.2.0",
     "gulp-copy": "0.0.2",
-    "gulp-flatten": "0.0.4",
-    "gulp-header": "^1.2.2",
-    "gulp-help": "^1.6.0",
-    "gulp-if": "^1.2.5",
+    "gulp-dedupe": "0.0.2",
+    "gulp-flatten": "^0.2.0",
+    "gulp-header": "^1.8.2",
+    "gulp-help": "^1.6.1",
+    "gulp-if": "^2.0.1",
     "gulp-json-editor": "^2.2.1",
-    "gulp-less": "^3.0.3",
-    "gulp-minify-css": "^1.2.0",
+    "gulp-less": "^3.1.0",
+    "gulp-clean-css": "^2.0.6",
     "gulp-notify": "^2.2.0",
-    "gulp-plumber": "^1.0.1",
-    "gulp-print": "^1.1.0",
-    "gulp-prompt": "^0.1.2",
+    "gulp-plumber": "^1.1.0",
+    "gulp-print": "^2.0.1",
+    "gulp-prompt": "^0.2.0",
     "gulp-rename": "^1.2.2",
-    "gulp-replace": "^0.5.3",
-    "gulp-rtlcss": "^0.1.4",
-    "gulp-uglify": "^1.2.0",
-    "gulp-util": "^3.0.6",
-    "gulp-watch": "^4.2.4",
-    "jquery": "^2.1.4",
+    "gulp-replace": "^0.5.4",
+    "gulp-rtlcss": "^1.0.0",
+    "gulp-uglify": "^1.5.3",
+    "gulp-util": "^3.0.7",
+    "gulp-watch": "^4.3.5",
+    "jquery": "^2.2.3 || ^3.0.0",
     "map-stream": "^0.1.0",
+    "merge-stream": "^1.0.0",
     "mkdirp": "^0.5.1",
     "require-dot-file": "^0.4.0",
+    "run-sequence": "^1.1.5",
     "wrench": "https://github.com/derekslife/wrench-js/tarball/156eaceed68ed31ffe2a3ecfbcb2be6ed1417fb2",
-    "yamljs": "^0.2.3"
+    "yamljs": "^0.2.7"
   },
   "devDependencies": {
-    "github": "^0.2.4",
-    "gulp-concat-filenames": "0.0.3",
-    "gulp-debug": "^2.0.1",
-    "gulp-git": "^1.2.4",
-    "gulp-tap": "^0.1.3",
-    "merge-stream": "^0.1.7",
-    "run-sequence": "^1.1.0"
-  }
+    "github": "*",
+    "gulp-concat-filenames": "*",
+    "gulp-debug": "*",
+    "gulp-git": "*",
+    "gulp-tap": "*",
+    "merge-stream": "*"
+  },
+  "style": "dist/semantic.css"
 }

data/share/views/public/plugins/semantic-ui/semantic.json.example

@@ -18,6 +18,7 @@
   },
 
   "permission" : false,
+  "autoInstall": false,
   "rtl": false
 
 }

data/share/views/public/plugins/semantic-ui/src/_site/collections/message.overrides

@@ -1,3 +1,3 @@
 /*******************************
-    User Variable Overrides
+        Site Overrides
 *******************************/

data/share/views/public/plugins/semantic-ui/src/definitions/behaviors/api.js

@@ -3,16 +3,23 @@
  * http://github.com/semantic-org/semantic-ui/
  *
  *
- * Copyright 2015 Contributors
  * Released under the MIT license
  * http://opensource.org/licenses/MIT
  *
  */
 
-;(function ( $, window, document, undefined ) {
+;(function ($, window, document, undefined) {
 
 "use strict";
 
+var
+  window = (typeof window != 'undefined' && window.Math == Math)
+    ? window
+    : (typeof self != 'undefined' && self.Math == Math)
+      ? self
+      : Function('return this')()
+;
+
 $.api = $.fn.api = function(parameters) {
 
   var
@@ -109,12 +116,26 @@ $.api = $.fn.api = function(parameters) {
               ;
             }
             else if(settings.on == 'now') {
-              module.debug('Querying API now', triggerEvent);
+              module.debug('Querying API endpoint immediately');
               module.query();
             }
           }
         },
 
+        decode: {
+          json: function(response) {
+            if(response !== undefined && typeof response == 'string') {
+              try {
+               response = JSON.parse(response);
+              }
+              catch(e) {
+                // isnt json string
+              }
+            }
+            return response;
+          }
+        },
+
         read: {
           cachedResponse: function(url) {
             var
@@ -126,16 +147,8 @@ $.api = $.fn.api = function(parameters) {
             }
             response = sessionStorage.getItem(url);
             module.debug('Using cached response', url, response);
-            if(response !== undefined) {
-              try {
-               response = JSON.parse(response);
-              }
-              catch(e) {
-                // didnt store object
-              }
-              return response;
-            }
-            return false;
+            response = module.decode.json(response);
+            return response;
           }
         },
         write: {
@@ -207,12 +220,12 @@ $.api = $.fn.api = function(parameters) {
 
           // replace variables
           url = module.add.urlData( url );
-
           // missing url parameters
           if( !url && !module.is.mocked()) {
             return;
           }
 
+          requestSettings.url = settings.base + url;
 
           // look for jQuery ajax parameters in settings
           ajaxSettings = $.extend(true, {}, settings, {
@@ -227,7 +240,6 @@ $.api = $.fn.api = function(parameters) {
 
           module.debug('Querying URL', ajaxSettings.url);
           module.verbose('Using AJAX settings', ajaxSettings);
-
           if(settings.cache === 'local' && module.read.cachedResponse(url)) {
             module.debug('Response returned from local cache');
             module.request = module.create.request();
@@ -260,21 +272,33 @@ $.api = $.fn.api = function(parameters) {
 
         },
 
+        should: {
+          removeError: function() {
+            return ( settings.hideError === true || (settings.hideError === 'auto' && !module.is.form()) );
+          }
+        },
+
         is: {
           disabled: function() {
             return ($module.filter(selector.disabled).length > 0);
           },
+          expectingJSON: function() {
+            return settings.dataType === 'json' || settings.dataType === 'jsonp';
+          },
           form: function() {
-            return $module.is('form');
+            return $module.is('form') || $context.is('form');
           },
           mocked: function() {
-            return (settings.mockResponse || settings.mockResponseAsync);
+            return (settings.mockResponse || settings.mockResponseAsync || settings.response || settings.responseAsync);
           },
           input: function() {
             return $module.is('input');
           },
           loading: function() {
-            return (module.request && module.request.state() == 'pending');
+            return (module.request)
+              ? (module.request.state() == 'pending')
+              : false
+            ;
           },
           abortedRequest: function(xhr) {
             if(xhr && xhr.readyState !== undefined && xhr.readyState === 0) {
@@ -287,7 +311,7 @@ $.api = $.fn.api = function(parameters) {
             }
           },
           validResponse: function(response) {
-            if( settings.dataType !== 'json' || !$.isFunction(settings.successTest) ) {
+            if( (!module.is.expectingJSON()) || !$.isFunction(settings.successTest) ) {
               module.verbose('Response is not JSON, skipping validation', settings.successTest, response);
               return true;
             }
@@ -352,6 +376,10 @@ $.api = $.fn.api = function(parameters) {
                   }
                   else {
                     module.verbose('Found required variable', variable, value);
+                    value = (settings.encodeParameters)
+                      ? module.get.urlEncodedValue(value)
+                      : value
+                    ;
                     url = url.replace(templatedString, value);
                   }
                 });
@@ -445,15 +473,17 @@ $.api = $.fn.api = function(parameters) {
           },
           xhr: {
             always: function() {
-              // calculate if loading time was below minimum threshold
+              // nothing special
             },
             done: function(response, textStatus, xhr) {
               var
-                context      = this,
-                elapsedTime  = (new Date().getTime() - requestStartTime),
-                timeLeft     = (settings.loadingDuration - elapsedTime),
+                context            = this,
+                elapsedTime        = (new Date().getTime() - requestStartTime),
+                timeLeft           = (settings.loadingDuration - elapsedTime),
                 translatedResponse = ( $.isFunction(settings.onResponse) )
-                  ? settings.onResponse.call(context, $.extend(true, {}, response))
+                  ? module.is.expectingJSON()
+                    ? settings.onResponse.call(context, $.extend(true, {}, response))
+                    : settings.onResponse.call(context, response)
                   : false
               ;
               timeLeft = (timeLeft > 0)
@@ -469,7 +499,7 @@ $.api = $.fn.api = function(parameters) {
               }
               setTimeout(function() {
                 if( module.is.validResponse(response) ) {
-                  module.request.resolveWith(context, [response]);
+                  module.request.resolveWith(context, [response, xhr]);
                 }
                 else {
                   module.request.rejectWith(context, [xhr, 'invalid']);
@@ -500,56 +530,65 @@ $.api = $.fn.api = function(parameters) {
             }
           },
           request: {
-            complete: function(response) {
-              module.remove.loading();
-              settings.onComplete.call(context, response, $module);
-            },
-            done: function(response) {
+            done: function(response, xhr) {
               module.debug('Successful API Response', response);
               if(settings.cache === 'local' && url) {
                 module.write.cachedResponse(url, response);
                 module.debug('Saving server response locally', module.cache);
               }
-              settings.onSuccess.call(context, response, $module);
+              settings.onSuccess.call(context, response, $module, xhr);
+            },
+            complete: function(firstParameter, secondParameter) {
+              var
+                xhr,
+                response
+              ;
+              // have to guess callback parameters based on request success
+              if( module.was.succesful() ) {
+                response = firstParameter;
+                xhr      = secondParameter;
+              }
+              else {
+                xhr      = firstParameter;
+                response = module.get.responseFromXHR(xhr);
+              }
+              module.remove.loading();
+              settings.onComplete.call(context, response, $module, xhr);
             },
             fail: function(xhr, status, httpMessage) {
               var
                 // pull response from xhr if available
-                response = $.isPlainObject(xhr)
-                  ? (xhr.responseText)
-                  : false,
-                errorMessage = ($.isPlainObject(response) && response.error !== undefined)
-                  ? response.error // use json error message
-                  : (settings.error[status] !== undefined) // use server error message
-                    ? settings.error[status]
-                    : httpMessage
+                response     = module.get.responseFromXHR(xhr),
+                errorMessage = module.get.errorFromRequest(response, status, httpMessage)
               ;
               if(status == 'aborted') {
                 module.debug('XHR Aborted (Most likely caused by page navigation or CORS Policy)', status, httpMessage);
-                settings.onAbort.call(context, status, $module);
+                settings.onAbort.call(context, status, $module, xhr);
+                return true;
               }
               else if(status == 'invalid') {
                 module.debug('JSON did not pass success test. A server-side error has most likely occurred', response);
               }
-              else if(status == 'error')  {
-
+              else if(status == 'error') {
                 if(xhr !== undefined) {
                   module.debug('XHR produced a server error', status, httpMessage);
                   // make sure we have an error to display to console
                   if( xhr.status != 200 && httpMessage !== undefined && httpMessage !== '') {
                     module.error(error.statusMessage + httpMessage, ajaxSettings.url);
                   }
-                  settings.onError.call(context, errorMessage, $module);
+                  settings.onError.call(context, errorMessage, $module, xhr);
                 }
               }
 
               if(settings.errorDuration && status !== 'aborted') {
                 module.debug('Adding error state');
                 module.set.error();
-                setTimeout(module.remove.error, settings.errorDuration);
+                if( module.should.removeError() ) {
+                  setTimeout(module.remove.error, settings.errorDuration);
+                }
               }
               module.debug('API Request failed', errorMessage, xhr);
-              settings.onFailure.call(context, response, $module);
+              settings.onFailure.call(context, response, $module, xhr);
             }
           }
         },
@@ -568,9 +607,11 @@ $.api = $.fn.api = function(parameters) {
           mockedXHR: function () {
             var
               // xhr does not simulate these properties of xhr but must return them
-              textStatus  = false,
-              status      = false,
-              httpMessage = false,
+              textStatus     = false,
+              status         = false,
+              httpMessage    = false,
+              responder      = settings.mockResponse      || settings.response,
+              asyncResponder = settings.mockResponseAsync || settings.responseAsync,
               asyncCallback,
               response,
               mockedXHR
@@ -582,19 +623,19 @@ $.api = $.fn.api = function(parameters) {
               .fail(module.event.xhr.fail)
             ;
 
-            if(settings.mockResponse) {
-              if( $.isFunction(settings.mockResponse) ) {
-                module.debug('Using mocked callback returning response', settings.mockResponse);
-                response = settings.mockResponse.call(context, settings);
+            if(responder) {
+              if( $.isFunction(responder) ) {
+                module.debug('Using specified synchronous callback', responder);
+                response = responder.call(context, requestSettings);
               }
               else {
-                module.debug('Using specified response', settings.mockResponse);
-                response = settings.mockResponse;
+                module.debug('Using settings specified response', responder);
+                response = responder;
               }
               // simulating response
               mockedXHR.resolveWith(context, [ response, textStatus, { responseText: response }]);
             }
-            else if( $.isFunction(settings.mockResponseAsync) ) {
+            else if( $.isFunction(asyncResponder) ) {
               asyncCallback = function(response) {
                 module.debug('Async callback returned response', response);
 
@@ -605,8 +646,8 @@ $.api = $.fn.api = function(parameters) {
                   mockedXHR.rejectWith(context, [{ responseText: response }, status, httpMessage]);
                 }
               };
-              module.debug('Using async mocked response', settings.mockResponseAsync);
-              settings.mockResponseAsync.call(context, settings, asyncCallback);
+              module.debug('Using specified async response callback', asyncResponder);
+              asyncResponder.call(context, requestSettings, asyncCallback);
             }
             return mockedXHR;
           },
@@ -621,7 +662,7 @@ $.api = $.fn.api = function(parameters) {
               .done(module.event.xhr.done)
               .fail(module.event.xhr.fail)
             ;
-            module.verbose('Created server request', xhr);
+            module.verbose('Created server request', xhr, ajaxSettings);
             return xhr;
           }
         },
@@ -650,6 +691,22 @@ $.api = $.fn.api = function(parameters) {
         },
 
         get: {
+          responseFromXHR: function(xhr) {
+            return $.isPlainObject(xhr)
+              ? (module.is.expectingJSON())
+                ? module.decode.json(xhr.responseText)
+                : xhr.responseText
+              : false
+            ;
+          },
+          errorFromRequest: function(response, status, httpMessage) {
+            return ($.isPlainObject(response) && response.error !== undefined)
+              ? response.error // use json error message
+              : (settings.error[status] !== undefined) // use server error message
+                ? settings.error[status]
+                : httpMessage
+            ;
+          },
           request: function() {
             return module.request || false;
           },
@@ -681,10 +738,26 @@ $.api = $.fn.api = function(parameters) {
             if(runSettings === undefined) {
               module.error(error.noReturnedValue);
             }
+            if(runSettings === false) {
+              return runSettings;
+            }
             return (runSettings !== undefined)
-              ? runSettings
-              : settings
+              ? $.extend(true, {}, runSettings)
+              : $.extend(true, {}, settings)
+            ;
+          },
+          urlEncodedValue: function(value) {
+            var
+              decodedValue   = window.decodeURIComponent(value),
+              encodedValue   = window.encodeURIComponent(value),
+              alreadyEncoded = (decodedValue !== value)
             ;
+            if(alreadyEncoded) {
+              module.debug('URL value is already encoded, avoiding double encoding', value);
+              return value;
+            }
+            module.verbose('Encoding value using encodeURIComponent', value, encodedValue);
+            return encodedValue;
           },
           defaultData: function() {
             var
@@ -694,7 +767,7 @@ $.api = $.fn.api = function(parameters) {
               if( module.is.input() ) {
                 data.value = $module.val();
               }
-              else if( !module.is.form() ) {
+              else if( module.is.form() ) {
 
               }
               else {
@@ -744,7 +817,7 @@ $.api = $.fn.api = function(parameters) {
               url = settings.api[action];
             }
             else if( module.is.form() ) {
-              url = $module.attr('action') || false;
+              url = $module.attr('action') || $context.attr('action') || false;
               module.debug('No url or action specified, defaulting to form action', url);
             }
             return url;
@@ -773,7 +846,12 @@ $.api = $.fn.api = function(parameters) {
             $.extend(true, settings, name);
           }
           else if(value !== undefined) {
-            settings[name] = value;
+            if($.isPlainObject(settings[name])) {
+              $.extend(true, settings[name], value);
+            }
+            else {
+              settings[name] = value;
+            }
           }
           else {
             return settings[name];
@@ -791,7 +869,7 @@ $.api = $.fn.api = function(parameters) {
           }
         },
         debug: function() {
-          if(settings.debug) {
+          if(!settings.silent && settings.debug) {
             if(settings.performance) {
               module.performance.log(arguments);
             }
@@ -802,7 +880,7 @@ $.api = $.fn.api = function(parameters) {
           }
         },
         verbose: function() {
-          if(settings.verbose && settings.debug) {
+          if(!settings.silent && settings.verbose && settings.debug) {
             if(settings.performance) {
               module.performance.log(arguments);
             }
@@ -813,8 +891,10 @@ $.api = $.fn.api = function(parameters) {
           }
         },
         error: function() {
-          module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
-          module.error.apply(console, arguments);
+          if(!settings.silent) {
+            module.error = Function.prototype.bind.call(console.error, console, settings.name + ':');
+            module.error.apply(console, arguments);
+          }
         },
         performance: {
           log: function(message) {
@@ -949,7 +1029,7 @@ $.api.settings = {
   name              : 'API',
   namespace         : 'api',
 
-  debug             : true,
+  debug             : false,
   verbose           : false,
   performance       : true,
 
@@ -971,9 +1051,15 @@ $.api.settings = {
   // duration for loading state
   loadingDuration   : 0,
 
+  // whether to hide errors after a period of time
+  hideError         : 'auto',
+
   // duration for error state
   errorDuration     : 2000,
 
+  // whether parameters should be encoded with encodeURIComponent
+  encodeParameters  : true,
+
   // API action to use
   action            : false,
 
@@ -1007,6 +1093,10 @@ $.api.settings = {
   mockResponse      : false,
   mockResponseAsync : false,
 
+  // aliases for mock
+  response          : false,
+  responseAsync     : false,
+
   // callbacks before request
   beforeSend  : function(settings) { return settings; },
   beforeXHR   : function(xhr) {},
@@ -1044,7 +1134,7 @@ $.api.settings = {
     missingSerialize  : 'jquery-serialize-object is required to add form data to an existing data object',
     missingURL        : 'No URL specified for api event',
     noReturnedValue   : 'The beforeSend callback must return a settings object, beforeSend ignored.',
-    noStorage         : 'Caching respopnses locally requires session storage',
+    noStorage         : 'Caching responses locally requires session storage',
     parseError        : 'There was an error parsing your request',
     requiredParameter : 'Missing a required URL parameter: ',
     statusMessage     : 'Server gave an error: ',
@@ -1074,4 +1164,4 @@ $.api.settings = {
 
 
 
-})( jQuery, window , document );
+})( jQuery, window, document );