Merge branch 'master' into svy2019_06

Servoy · Apr 26, 2019 · 3076fd9 · 3076fd9
2 parents 79f1c1b + 40dd5a0
commit 3076fd9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ CSS-ClientLibs: css/bootstrap/css/bootstrap.css;name=bootstrap;version
  =3.4.1
 Bundle-SymbolicName: bootstrapcomponents
 Bundle-Name: Bootstrap Components
-Bundle-Version: 1.5.3
+Bundle-Version: 1.6.1
 Created-By: 1.7.0_05-b06 (Oracle Corporation)
 Package-Type: Web-Component
 JS-ClientLibs: bootstrapcomponents/lib/js/bscomponents-common.js;name=

diff --git a/textbox/textbox.spec b/textbox/textbox.spec
@@ -21,12 +21,12 @@
 	    	"visible" : "visible",	    
 	    	"selectOnEnter" : {"type" :"boolean", "tags": { "scope" :"design" }},
 	    	"autocomplete" : 
-	    		{"type" :"string", "tags": { "scope" :"design" }, "default": "off",  
+	    		{"type" :"string","tags": { "scope" :"design", "valuesFieldType":"typeahead"}, "default": "off",
 	    			"values" :
 	    			[ 
-	    				"off", "name", "given-name", "additional-name", "family-name","nickname", "organization-title", "username", "new-password" , "current-password", "organization", "email", "street-address", "address-level1", 
+	    				"billing", "shipping", "home", "work", "mobile", "fax", "pager", "name", "given-name", "additional-name", "family-name","nickname", "organization-title", "username", "new-password" , "current-password", "organization", "email", "street-address", "address-level1", 
 	    				"address-level2", "address-level3", "address-level4", "country", "country-name", "postal-code", "cc-name", "cc-given-name", "cc-additional-name", "cc-family-name", "cc-number", "cc-exp", "cc-exp-month", "cc-exp-year", "cc-csc", "cc-type", 
-	    				"transaction-currency", "transaction-amount", "language", "bday", "bday-day", "bday-month", "bday-year", "sex", "url", "tel", "tel-country-code", "tel-national","tel-area-code", "tel-local"
+	    				"transaction-currency", "transaction-amount", "language", "bday", "bday-day", "bday-month", "bday-year", "sex", "url", "tel", "tel-country-code",  "tel-national","tel-area-code", "tel-local"
 	    		    ]
 	    	    }
 	},

diff --git a/webpackage.json b/webpackage.json
@@ -29,5 +29,6 @@
 		{"version":"1.4.2","url":"https://github.com/Servoy/bootstrapcomponents/releases/download/v1.4.2/bootstrapcomponents.zip", "servoy-version":"8.3.1", "dependency":"12grid#>=1.0.3"},
 		{"version":"1.5.0","url":"https://github.com/Servoy/bootstrapcomponents/releases/download/v1.5.0/bootstrapcomponents.zip", "servoy-version":"8.3.1", "dependency":"12grid#>=1.0.3"},
 		{"version":"1.5.1","url":"https://github.com/Servoy/bootstrapcomponents/releases/download/v1.5.1/bootstrapcomponents.zip", "servoy-version":"8.3.1", "dependency":"12grid#>=1.0.3"},
-		{"version":"1.5.2","url":"https://github.com/Servoy/bootstrapcomponents/releases/download/v1.5.2/bootstrapcomponents.zip", "servoy-version":"8.3.1", "dependency":"12grid#>=1.0.3"}
+		{"version":"1.5.2","url":"https://github.com/Servoy/bootstrapcomponents/releases/download/v1.5.2/bootstrapcomponents.zip", "servoy-version":"8.3.1", "dependency":"12grid#>=1.0.3"},
+		{"version":"1.6.0","url":"https://github.com/Servoy/bootstrapcomponents/releases/download/v1.6.0/bootstrapcomponents.zip", "servoy-version":"8.4.0", "dependency":"12grid#>=1.0.3"}
 ]}