Merge branch 'master' into TIMOB-27263

tidev · Sep 5, 2019 · cce212c · cce212c
2 parents ba97fdb + e24ffe3
commit cce212c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/apidoc/Titanium/UI/Android/DrawerLayout.yml b/apidoc/Titanium/UI/Android/DrawerLayout.yml
@@ -209,8 +209,8 @@ examples:
             centerView.add(btn);
 
             win.addEventListener('open', function(){
-                var activity = win.getActivity(),
-                    actionBar = activity.getActionBar();
+                var activity = win.activity,
+                    actionBar = activity.actionBar;
 
                 if (actionBar) {
                     actionBar.displayHomeAsUp = true;

diff --git a/apidoc/Titanium/UI/TextField.yml b/apidoc/Titanium/UI/TextField.yml
@@ -72,7 +72,7 @@ properties:
   - name: keyboardAppearance
     summary: Determines the appearance of the keyboard displayed when this field is focused.
     type: Number
-    constants: Titanium.UI.KEYBOARD_APPEARANCE_*
+    constants: [Titanium.UI.KEYBOARD_APPEARANCE_DARK, Titanium.UI.KEYBOARD_APPEARANCE_LIGHT, Titanium.UI.KEYBOARD_APPEARANCE_DEFAULT]
     default: <Titanium.UI.KEYBOARD_APPEARANCE_DEFAULT>
     platforms: [iphone, ipad]
 

diff --git a/apidoc/Titanium/UI/UI.yml b/apidoc/Titanium/UI/UI.yml
@@ -1545,8 +1545,6 @@ properties:
     platforms: [android, iphone, ipad]
 
   - name: HINT_TYPE_STATIC
-    deprecated:
-        since: "6.2.0"
     summary: |
         Use when creating a TextField to specify the hintType as static.
     type: Number

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -69,7 +69,7 @@
     "ejs": "^2.6.1",
     "fields": "0.1.24",
     "fs-extra": "^8.0.1",
-    "ioslib": "^1.7.12",
+    "ioslib": "^1.7.13",
     "klaw-sync": "^6.0.0",
     "liveview": "^1.5.0",
     "lodash.defaultsdeep": "^4.6.1",