Merge remote-tracking branch 'origin/dev'

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "src/components"
+}

.gitignore

@@ -1,4 +1,4 @@
-
+/src/components
 
 /node_modules
 /docs

.travis.yml

@@ -1,6 +1,10 @@
 language: node_js
 node_js:
     - "0.8"
+before_install:
+    - "npm cache clean ."
 script:
     - "npm install -g grunt-cli"
-    - "grunt test"
+    - "npm install -g bower"
+    - "bower install"
+    - "grunt test --verbose"

CHANGELOG.md

@@ -1,3 +1,26 @@
+Changed in 2.3.0
+======
+* Moved all client-side dependencies to use bower and restructured project to make sense of this change
+* Removed unused corodova plugin architecture from lavaca/env/Device since it is handled by corodva cli
+* Significant updates to the Form widget, and added tests for Form widget
+  - Added 'autoTrim' option
+  - Made URL regex more forgiving
+  - More robust & less redundant get/set value logic
+  - set() can accept a hash of names and values
+  - Added 'treatAsGroup' option for rules
+  - Added hook for input formatters
+* Added animationEndEvent function to the Animation class
+* Change autoRender behavior for childViews so that render() is called after the child view is created instead of in the View constructor fixing the intended behavior.
+* Updated History to fix navigating back out of a lavaca site.
+* Fixed cmd/ctr click on links
+* Refactored onTapLink
+  - Now auto checks for external links and ignores them
+  - Added support for cordova in app browser
+  - Added `force-back` rel to force `History.isRoutingBack = true`
+* Add new signature to mapChildView which will allow for dynamically selecting/creating the childView's model
+* Fixed bindLinkHandler to appropriately bind click or tap events based on the inclusion of Hammer
+
+
 Changed in 2.2.0
 ======
 * Combined PageView and View into a single class

Gruntfile.js

@@ -50,7 +50,7 @@ module.exports = function(grunt) {
     },
 
     requirejs: {
-      baseUrl: 'src/js',
+      baseUrl: 'src',
       mainConfigFile: 'src/boot.js',
       optimize: 'none',
       keepBuildDir: true,

MIT-LICENSE.txt

@@ -29,18 +29,6 @@ LinkedIn Fork of Dust.js 1.1
 (c) 2010, Aleksander Williams
 Released under the MIT license.
 
-Zepto.js 0.8.0
-(c) 2011 Thomas Fuchs
-Released under the MIT license
-
-ChildBrowser
-(c) 2012 Jesse MacFadyen, Nitobi
-Released under the MIT license
-
-lz77.js
-(c) 2009 Olle Törnström
-Released under the MIT license
-
 iScroll 4.1.9
 (c) 2011 Matteo Spinelli
 Released under the MIT license

README.md

@@ -3,11 +3,30 @@
 A curated collection of tools built for mobile
 
 ## Getting Started
-Pull down a [lavaca-starter project](https://github.com/mutualmobile/lavaca-starter) and do `npm install`
-
-or
-
-In an existing lavaca project do `npm install lavaca`
+Pull down a [lavaca-starter project](https://github.com/mutualmobile/lavaca-starter)
+
+## Run Tests
+1. __Install grunt-cli globally__
+Note: this may require sudo
+```bash
+$ npm install -g grunt-cli
+```
+
+2. __Install bower globally__
+Note: this may require sudo
+```bash
+$ npm install -g bower
+```
+
+3. __Install dev dependencies for our tasks to work__
+```bash
+$ npm install && bower install
+```
+
+4. __Run Tests__
+```bash
+$ grunt test
+```
 
 ## Documentation
 <http://getlavaca.com/#/guide>

bower.json

@@ -0,0 +1,29 @@
+{
+  "name": "lavaca",
+  "main": "lavaca.js",
+  "version": "2.3.0",
+  "homepage": "https://github.com/mutualmobile/lavaca",
+  "authors": [
+    "Mutual Mobile <[email protected]>"
+  ],
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": "http://ajax.googleapis.com/ajax/libs/jquery/2.0.3/jquery.js",
+    "dustjs-linkedin": "https://github.com/georgehenderson/dustjs.git#2.0.4",
+    "dustjs-linkedin-helpers": "~1.1.1",
+    "require-dust": "https://github.com/georgehenderson/require-dust.git#master",
+    "mout": "~0.7.1",
+    "es5-shim": "~2.1.0",
+    "requirejs ": "~2.1.8",
+    "iscroll ": "~5.0.5",
+    "less.js": "~1.4.2",
+    "hammerjs": "https://github.com/EightMedia/hammer.js.git#1.0.5"
+  }
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "lavaca",
   "description": "A curated collection of tools built for mobile.",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "homepage": "https://github.com/mutualmobile/lavaca",
   "author": {
     "name": "mutualmobile",
@@ -25,13 +25,7 @@
     "node": ">= 0.8.0"
   },
   "dependencies": {
-    "dustjs-linkedin": "2.0.3",
-    "dustjs-helpers": "1.1.1",
-    "mout": "0.x",
-    "es5-shim": "2.1.0",
-    "requirejs ": "2.1.8",
-    "iscroll ": "5.0.5",
-    "less ": "1.4.2"
+    "requirejs ": "2.1.8"
   },
   "devDependencies": {
     "grunt": "~0.4.1",
@@ -59,8 +53,5 @@
     "localStorage",
     "events",
     "animation"
-  ],
-  "scripts": {
-    "postinstall": "node ./postinstall.js"
-  }
+  ]
 }

src/boot.js

@@ -1,17 +1,15 @@
 require.config({
-  baseUrl: 'js',
+  baseUrl: './',
   paths: {
-    'es5-shim': 'libs/es5-shim',
-    '$': 'libs/jquery-2.0.0',
-    'jquery': 'libs/jquery-2.0.0',
-    'cordova': 'libs/cordova',
-    'mout': 'libs/mout',
-    'docCookies': 'libs/docCookies',
-    'dust': 'libs/dust-full-2.0.3',
-    'dust-helpers': 'libs/dust-helpers-1.1.1',
-    'rdust': 'libs/require-dust',
-    'iscroll': 'libs/iscroll-lite',
-    'lavaca': 'lavaca'
+    'es5-shim': 'components/es5-shim/es5-shim',
+    '$': 'components/jquery/index',
+    'jquery': 'components/jquery/index',
+    'mout': 'components/mout/src',
+    'dust': 'components/dustjs-linkedin/dist/dust-full-2.0.3',
+    'dust-helpers': 'components/dustjs-linkedin-helpers/dist/dust-helpers-1.1.1',
+    'rdust': 'components/require-dust/require-dust',
+    'iScroll': 'components/iscroll/dist/iscroll-lite-min',
+    'lavaca': './'
   },
   shim: {
     $: {

src/env/Device.js

@@ -0,0 +1,43 @@
+define(function(require) {
+
+  var $ = require('$');
+
+  /**
+   * Static utility type for working with Cordova (aka PhoneGap) and other non-standard native functionality
+   * @class lavaca.env.Device
+   */
+
+  var Device = {};
+
+  /**
+   * Indicates whether or not the app is being run through Cordova
+   * @method isCordova
+   * @static
+   *
+   * @return {Boolean}  True if app is being run through Cordova
+   */
+  Device.isCordova = function() {
+    return !!window.cordova;
+  };
+
+  /**
+   * Executes a callback when the device is ready to be used
+   * @method init
+   * @static
+   *
+   * @param {Function} callback  The handler to execute when the device is ready
+   */
+  Device.init = function(callback) {
+    if (!Device.isCordova()) {
+      $(document).ready(callback);
+    } else if (document.addEventListener) {
+      // Android fix
+      document.addEventListener('deviceready', callback, false);
+    } else {
+      $(document).on('deviceready', callback);
+    }
+  };
+
+  return Device;
+
+});

src/js/lavaca/fx/Animation.js → src/fx/Animation.js

@@ -49,6 +49,17 @@ define(function(require) {
     return !!_prop;
   };
 
+  /**
+   * Gets the name of the animation end event
+   * @method animationEndEvent
+   * @static
+   *
+   * @return {String}  The name of the event
+   */
+  Animation.animationEndEvent = function() {
+    return _event;
+  };
+
   /**
    * Converts a list of keyframes to a CSS animation
    * @method keyframesToCSS