Merge pull request #56 from mendix/develop

Merge develop into release

README.md

@@ -12,20 +12,22 @@ possibilities. Here you will find a basic overview of our framework.
 theme/
 ├── styles/
 |   ├── native/
-|       ├── app/
-|       |   ├── _custom-variables.js
-|       |   └── _custom.js
-|       ├── core/
-|       |   ├── base/
-|       |   ├── helpers/
-|       |   ├── widgets/
-|       |   | _variables.js
-|       |   └── manifest.json
-|       ├── ui_resources/
-|       |   └── atlas_ui_resources/
-|       |       ├── buildingblocks/
-|       |       └── layouts/
-|       └── main.js
+|   |   ├── ts/     // Will not be in the Atlas UI Resources module
+|   |   ├── js/
+|   |       ├── app/
+|   |       |   ├── _custom-variables.js
+|   |       |   └── _custom.js
+|   |       ├── core/
+|   |       |   ├── base/
+|   |       |   ├── helpers/
+|   |       |   ├── widgets/
+|   |       |   | _variables.js
+|   |       |   └── manifest.json
+|   |       ├── ui_resources/
+|   |       |   └── atlas_ui_resources/
+|   |       |       ├── buildingblocks/
+|   |       |       └── layouts/
+|   |       └── main.js
 |   └── web/
 |       ├── css/
 |       │   ├── * all output files

package.json

@@ -1,6 +1,6 @@
 {
     "name": "atlas-ui-framework",
-    "version": "2.5.4",
+    "version": "2.5.5",
     "description": "Mendix Atlas UI is the foundation of making beautiful apps with Mendix. For more information about the framework go to https://atlas.mendix.com.",
     "main": "",
     "scripts": {
@@ -17,5 +17,7 @@
     "bugs": {
         "url": "https://github.com/mendix/Atlas-UI-Framework/issues"
     },
-    "homepage": "https://github.com/mendix/Atlas-UI-Framework#readme"
+    "homepage": "https://github.com/mendix/Atlas-UI-Framework#readme",
+    "devDependencies": {},
+    "dependencies": {}
 }

scripts/lib/readFile.js

@@ -3,7 +3,7 @@ const path = require("path");
 module.exports.getVersionFilePaths = () => ({
     pkg: path.join(process.cwd(), "package.json"),
     manifest: {
-        js: path.join(process.cwd(), "styles", "native", "core", "manifest.json"),
+        js: path.join(process.cwd(), "styles", "native", "ts", "core", "manifest.json"),
         sass: path.join(process.cwd(), "styles", "web", "sass", "core", "manifest.json"),
     },
 });

settings-native.json

@@ -1034,6 +1034,56 @@
                 "class": "tabContainerScroll"
             }
         ],
+        "TextBox": [
+            {
+                "name": "Capitalize",
+                "type": "Dropdown",
+                "description": "Change the capitalization of the input.",
+                "options": [
+                    {
+                        "name": "None",
+                        "class": "textInputCapitalizeNone"
+                    },
+                    {
+                        "name": "Characters",
+                        "class": "textInputCapitalizeCharacters"
+                    },
+                    {
+                        "name": "Words",
+                        "class": "textInputCapitalizeWords"
+                    },
+                    {
+                        "name": "Sentences",
+                        "class": "textInputCapitalizeSentences"
+                    }
+                ]
+            }
+        ],
+        "TextArea": [
+            {
+                "name": "Capitalize",
+                "type": "Dropdown",
+                "description": "Change the capitalization of the input.",
+                "options": [
+                    {
+                        "name": "None",
+                        "class": "textInputCapitalizeNone"
+                    },
+                    {
+                        "name": "Characters",
+                        "class": "textInputCapitalizeCharacters"
+                    },
+                    {
+                        "name": "Words",
+                        "class": "textInputCapitalizeWords"
+                    },
+                    {
+                        "name": "Sentences",
+                        "class": "textInputCapitalizeSentences"
+                    }
+                ]
+            }
+        ],
         "com.mendix.widget.native.activityindicator.ActivityIndicator": [
             {
                 "name": "Activity indicator style",

styles.js

@@ -1,6 +1,6 @@
-import * as main    from './styles/native/main';
-import * as custom  from './styles/native/app/custom';
-import mergeobjects from './styles/native/core/helpers/_functions/mergeobjects';
+import * as custom  from "./styles/native/js/app/custom";
+import mergeobjects from "./styles/native/js/core/helpers/_functions/mergeobjects";
+import * as main    from "./styles/native/js/main";
 
 Object.keys(custom).forEach(key => {
     if (main[key]) {