Merge branch 'master' of github.com:JustinHoldstock/box-content-previ…

…ew into Highlight-annotations-on-mobile
JustinHoldstock · Jul 25, 2017 · b9c1c14 · b9c1c14
2 parents 242ad81 + 1e1495f
commit b9c1c14
Show file tree

Hide file tree

Showing 99 changed files with 12,896 additions and 293 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Change Log
 
+## [v1.1.1](https://github.com/box/box-content-preview/tree/v1.1.1) (2017-07-19)
+[Full Changelog](https://github.com/box/box-content-preview/compare/v1.1.0...v1.1.1)
+
+**Merged pull requests:**
+
+- Fix: Don't swallow 'touchstart' event to prevent iOS inertia scrolling [\#233](https://github.com/box/box-content-preview/pull/233) ([jeremypress](https://github.com/jeremypress))
+- Fix: Prevent MP3 from hiding [\#230](https://github.com/box/box-content-preview/pull/230) ([jeremypress](https://github.com/jeremypress))
+
 ## [v1.1.0](https://github.com/box/box-content-preview/tree/v1.1.0) (2017-07-18)
 [Full Changelog](https://github.com/box/box-content-preview/compare/v1.0.0...v1.1.0)
 
@@ -382,4 +390,4 @@
 - Setting up Travis [\#1](https://github.com/box/box-content-preview/pull/1) ([tonyjin](https://github.com/tonyjin))
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [![Project Status](https://img.shields.io/badge/status-active-brightgreen.svg?style=flat-square)](http://opensource.box.com/badges/)
 [![Styled With Prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 [![build status](https://img.shields.io/travis/box/box-content-preview/master.svg?style=flat-square)](https://travis-ci.org/box/box-content-preview)
-[![version](https://img.shields.io/badge/version-v1.1.0-blue.svg?style=flat-square)](https://github.com/box/box-content-preview)
+[![version](https://img.shields.io/badge/version-v1.1.1-blue.svg?style=flat-square)](https://github.com/box/box-content-preview)
 [![npm version](https://img.shields.io/npm/v/box-ui-elements.svg?style=flat-square)](https://www.npmjs.com/package/box-ui-elements)
 
 [Box Content Preview](https://docs.box.com/docs/box-content-preview)
@@ -19,11 +19,11 @@ If you are using Internet Explorer 11, which doesn't natively support promises,
 
 Current Version
 ---------------
-* Version: v1.1.0
+* Version: v1.1.1
 * Locale: en-US
 
-https://cdn01.boxcdn.net/platform/preview/1.1.0/en-US/preview.js
-https://cdn01.boxcdn.net/platform/preview/1.1.0/en-US/preview.css
+https://cdn01.boxcdn.net/platform/preview/1.1.1/en-US/preview.js
+https://cdn01.boxcdn.net/platform/preview/1.1.1/en-US/preview.css
 
 Supported Locales
 -----------------
@@ -37,6 +37,9 @@ Box Content Preview supports 100+ file types, including most document and image
 
 Usage
 -----
+The Box Content Preview UI Element can be used either by including the JavaScript/CSS scripts linked above or by pulling from our [NPM package](https://www.npmjs.com/package/box-ui-elements).
+
+### Including preview as a library
 You can self-host the Box Content Preview UI Element or reference the versions available on Box's CDN.
 
 ```html
@@ -50,8 +53,8 @@ You can self-host the Box Content Preview UI Element or reference the versions a
     <script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=Promise"></script>
 
     <!-- Latest version of Preview SDK for your locale -->
-    <script src="https://cdn01.boxcdn.net/platform/preview/1.1.0/en-US/preview.js"></script>
-    <link rel="stylesheet" href="https://cdn01.boxcdn.net/platform/preview/1.1.0/en-US/preview.css" />
+    <script src="https://cdn01.boxcdn.net/platform/preview/1.1.1/en-US/preview.js"></script>
+    <link rel="stylesheet" href="https://cdn01.boxcdn.net/platform/preview/1.1.1/en-US/preview.css" />
 </head>
 <body>
     <div class="preview-container" style="height:400px;width:575px"></div>
@@ -65,6 +68,9 @@ You can self-host the Box Content Preview UI Element or reference the versions a
 </html>
 ```
 
+### Importing preview as a React Component
+Please reference https://github.com/box/box-content-preview-demo for a minimal React application using the Preview UI Element.
+
 CORS (Cross-Origin Resource Sharing)
 ------------------------------------
 For security purposes, you must whitelist your application's HTTP origin, omitting any trailing slash, in the configuration section of the Developer Console. For example, CodePen's domain is whitelisted for the demo application below.

diff --git a/build/karma.conf.js b/build/karma.conf.js
@@ -3,7 +3,7 @@ const webpackConfig = require('./webpack.karma.config');
 
 const DOC_STATIC_ASSETS_VERSION = '0.130.0';
 const MEDIA_STATIC_ASSETS_VERSION = '0.127.0';
-const MODEL3D_STATIC_ASSETS_VERSION = '0.125.0';
+const MODEL3D_STATIC_ASSETS_VERSION = '1.1.1';
 const SWF_STATIC_ASSETS_VERSION = '0.112.0';
 const TEXT_STATIC_ASSETS_VERSION = '0.114.0';
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "box-content-preview",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Box Content Preview UI Element",
   "author": "Box (https://www.box.com/)",
   "license": "SEE LICENSE IN LICENSE",

diff --git a/src/i18n/da-DK.properties b/src/i18n/da-DK.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=En bruger
 annotation_posting_message=Slår op...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Punktanmærkningstilstand
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Fremhæv tekst
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Din session er udløbet. Genindlæs siden.
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=OK
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Klik et vilkårligt sted for at føje en kommentar til dokumentet
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Klik et vilkårligt sted for at føje en kommentar til dokumentet
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/de-DE.properties b/src/i18n/de-DE.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Beliebiger Benutzer
 annotation_posting_message=Wird gepostet...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Modus „Punktanmerkung“
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Text markieren
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Ihre Sitzung ist abgelaufen. Bitte aktualisieren
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=OK
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Klicken Sie an einer beliebigen Stelle, um einen Kommentar im Dokument hinzuzufügen
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Klicken Sie an einer beliebigen Stelle, um einen Kommentar im Dokument hinzuzufügen
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/en-AU.properties b/src/i18n/en-AU.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Some User
 annotation_posting_message=Posting...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Point annotation mode
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Highlight text
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Your session has expired. Please refresh the pag
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=Okay
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/en-CA.properties b/src/i18n/en-CA.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Some User
 annotation_posting_message=Posting...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Point annotation mode
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Highlight text
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Your session has expired. Please refresh the pag
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=Okay
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/en-GB.properties b/src/i18n/en-GB.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Some User
 annotation_posting_message=Posting...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Point annotation mode
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Highlight text
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Your session has expired. Please refresh the pag
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=Okay
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/en-US.properties b/src/i18n/en-US.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Some User
 annotation_posting_message=Posting...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Point annotation mode
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Highlight text
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Your session has expired. Please refresh the pag
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=Okay
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Click anywhere to add a comment to the document
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/es-ES.properties b/src/i18n/es-ES.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Algún usuario
 annotation_posting_message=Publicando...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Modo de anotación de puntos
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Resaltar texto
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=La sesión ha finalizado. Actualice la página.
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=Aceptar
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Haga clic en cualquier parte para añadir un comentario al documento
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Haga clic en cualquier parte para añadir un comentario al documento
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/fi-FI.properties b/src/i18n/fi-FI.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Jokin käyttäjä
 annotation_posting_message=Julkaistaan...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Kohdan huomautustila
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Korosta tekstiä
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Istunto on vanhentunut. Päivitä sivu.
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=OK
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Lisää kommentti asiakirjaan napsauttamalla mitä tahansa kohtaa
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Lisää kommentti asiakirjaan napsauttamalla mitä tahansa kohtaa
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/fr-CA.properties b/src/i18n/fr-CA.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Un utilisateur
 annotation_posting_message=Envoi en cours...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Mode d'annotation de point
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Surligner du texte
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Votre session a expiré. Veuillez actualiser la
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=OK
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Cliquez n'importe où dans le document pour y ajouter un commentaire
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Cliquez n'importe où dans le document pour y ajouter un commentaire
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/fr-FR.properties b/src/i18n/fr-FR.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Un utilisateur
 annotation_posting_message=Envoi en cours...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Mode d'annotation de point
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Surligner du texte
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=Votre session a expiré. Veuillez actualiser la
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=OK
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Cliquez n'importe où dans le document pour y ajouter un commentaire
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Cliquez n'importe où dans le document pour y ajouter un commentaire
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type

diff --git a/src/i18n/it-IT.properties b/src/i18n/it-IT.properties
@@ -123,6 +123,8 @@ annotation_anonymous_user_name=Un utente
 annotation_posting_message=Pubblicazione in corso...
 # Accessibilty message for button that toggles point annotation mode
 annotation_point_toggle=Modalità puntamento nota
+# Accessibilty message for button that toggles drawing annotation mode
+annotation_draw_toggle=Drawing annotation mode
 # Accessibilty text for button that adds and removes highlights on text
 annotation_highlight_toggle=Evidenzia testo
 # Accessibilty text for button that adds comments to text highlights
@@ -142,8 +144,10 @@ annotations_authorization_error=La sessione è scaduta. Aggiorna la pagina.
 # Notifications
 # Default text for notification button that dismisses notification
 notification_button_default_text=OK
-# Notification message shown when user enters annotation mode
-notification_annotation_mode=Fai clic in un punto qualsiasi per aggiungere un commento al documento
+# Notification message shown when user enters point annotation mode
+notification_annotation_point_mode=Fai clic in un punto qualsiasi per aggiungere un commento al documento
+# Notification message shown when user enters drawing annotation mode
+notification_annotation_draw_mode=Press down and drag the pointer to draw on the document
 
 # File Types
 # 360 degree video file type