Skip to content

Commit

Permalink
Merge branch 'master' into TIMOB-27292
Browse files Browse the repository at this point in the history
  • Loading branch information
ssekhri committed Aug 19, 2019
2 parents c0233fd + 45265d2 commit 25d8beb
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions apidoc/Titanium/UI/Android/Android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ properties:
summary: |
Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to disable plugins in a web view.
description: |
Content that requires a plugin, such as Flash Player, is not loaded, and any
Content that requires a plugin, is not loaded, and any
alternative content is displayed instead.
type: Number
permission: read-only
Expand All @@ -653,15 +653,15 @@ properties:
summary: |
Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to enable plugins in a web view.
description: |
Content that requires a plugin, such as Flash Player, is always loaded, whether or not a plugin is
Content that requires a plugin,, is always loaded, whether or not a plugin is
available for the content.
type: Number
permission: read-only

- name: WEBVIEW_PLUGINS_ON_DEMAND
summary: Display a placeholder and only load plugins when user selects it.
description: |
Content that requires a plugin, such as Flash Player, is replaced by a placeholder. When
Content that requires a plugin, is replaced by a placeholder. When
the user clicks on the placeholder, the plugin is loaded and the content is displayed.
Use with [WebView.pluginState](Titanium.UI.WebView.pluginState) to load plugins on demand.
Expand Down

0 comments on commit 25d8beb

Please sign in to comment.