Skip to content

Commit

Permalink
Merge pull request #389 from wet-boew/feature-multimedia-player
Browse files Browse the repository at this point in the history
Added a loading indicator to the multimedia player
  • Loading branch information
LaurentGoderre committed Sep 10, 2012
2 parents 37e81e7 + 1f40c84 commit 915fa7a
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 6 deletions.
Binary file modified build/js/bin/multimedia.swf
Binary file not shown.
2 changes: 1 addition & 1 deletion build/js/i18n/fr-min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added build/js/images/multimedia/loading.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion build/js/pe-ap-min.js

Large diffs are not rendered by default.

Binary file modified src/js/bin/multimedia.swf
Binary file not shown.
1 change: 1 addition & 0 deletions src/js/i18n/fr.js
Expand Up @@ -62,6 +62,7 @@
"%top-of-page": "Haut de la page",
"%you-are-in": "Vous êtes dans :",
"%welcome-to": "Bienvenue à : " + $('#gcwu-title').text(),
"%loading": "chargement...",
"%search": "Recherche",
"%search-for-terms": "Recherche de terme(s) :",
"%no-match-found": "Aucune correspondance trouvée",
Expand Down
Binary file added src/js/images/multimedia/loading.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 915fa7a

Please sign in to comment.