Bump versions and build

mchapman · mchapman · commit a50614c5dbcd · 2014-09-16T11:44:09.000+01:00
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "forms-angular",
   "author": "Mark Chapman <support@forms-angular.org>",  
-  "version": "0.4.0-beta.1",
+  "version": "0.4.0-beta.2",
   "homepage": "https://github.com/forms-angular/forms-angular",
   "description": "No nonsense forms for the MEAN stack",
   "keywords": [
diff --git a/dist/forms-angular.js b/dist/forms-angular.js
@@ -1,4 +1,4 @@
-/*! forms-angular 2014-09-11 */
+/*! forms-angular 2014-09-16 */
 'use strict';
 
 var formsAngular = angular.module('formsAngular', [
@@ -137,23 +137,22 @@ formsAngular.controller('BaseCtrl', ['$injector', '$scope', '$location', '$timeo
               formInstructions.select2.s2query = 'select2' + formInstructions.name.replace(/\./g, '_');
               $scope[formInstructions.select2.s2query] = {
                 allowClear: !mongooseOptions.required,
-                initSelection: function (element, callback) {
 
+                initSelection: function (element, callback) {
                   function executeCallback() {
                     var dataVal = $scope.record;
                     if (dataVal) {
                       var parts = formInstructions.name.split('.');
-                      while (parts.length > 1 && dataVal) {
+                      while (parts.length > 0 && dataVal) {
                         dataVal = dataVal[parts.shift()];
                       }
                     }
                     if (dataVal) {
-                      callback(element.select2('data'));
+                      callback(dataVal);
                     } else {
                       $timeout(executeCallback);
                     }
                   }
-
                   $timeout(executeCallback);
                 },
                 query: function (query) {
diff --git a/dist/forms-angular.min.js b/dist/forms-angular.min.js
diff --git a/less/forms-angular-with-bs2.css b/less/forms-angular-with-bs2.css
@@ -6529,3 +6529,11 @@ form .form-inline > .sub-doc {
     padding-right: 1em;
   }
 }
+.fileupload-form {
+  position: relative;
+  top: -30px;
+  margin-bottom: -30px;
+}
+.fileupload-buttonbar {
+  margin-left: 0;
+}
diff --git a/less/forms-angular-with-bs3.css b/less/forms-angular-with-bs3.css
@@ -6026,3 +6026,18 @@ form .form-inline > .sub-doc {
 form .tab-content {
   margin-top: 5px;
 }
+@media (max-width: 767px) {
+  .navbar-form {
+    width: auto;
+    border: 0;
+    margin-left: 0;
+    margin-right: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+  }
+  .navbar-form.navbar-right:last-child {
+    margin-right: -15px;
+  }
+}
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "author": "Mark Chapman <support@forms-angular.org>",
   "description": "A form builder that sits on top of Angular.js, Twitter Bootstrap, jQuery UI, Angular-UI, Express and Mongoose.  Opinionated or what?",
   "homepage": "http://forms-angular.org",
-  "version": "0.4.0-beta.1",
+  "version": "0.4.0-beta.2",
   "engines": {
     "node": "0.10.x",
     "npm": "1.x"

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "forms-angular",`
`3`	`3`	`"author": "Mark Chapman <support@forms-angular.org>",`
`4`		`- "version": "0.4.0-beta.1",`
	`4`	`+ "version": "0.4.0-beta.2",`
`5`	`5`	`"homepage": "https://github.com/forms-angular/forms-angular",`
`6`	`6`	`"description": "No nonsense forms for the MEAN stack",`
`7`	`7`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -6529,3 +6529,11 @@ form .form-inline > .sub-doc {`
`6529`	`6529`	`padding-right: 1em;`
`6530`	`6530`	`}`
`6531`	`6531`	`}`
	`6532`	`+.fileupload-form {`
	`6533`	`+ position: relative;`
	`6534`	`+ top: -30px;`
	`6535`	`+ margin-bottom: -30px;`
	`6536`	`+}`
	`6537`	`+.fileupload-buttonbar {`
	`6538`	`+ margin-left: 0;`
	`6539`	`+}`