From 8e090908be8a4207b2a5ad6bc8171eea20ba4784 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Mon, 22 Sep 2014 14:58:03 +0400 Subject: [PATCH 1/5] Initial commit --- app/js/directives.js | 11 +++++++++++ app/partials/desktop/audio_player.html | 13 +++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 app/partials/desktop/audio_player.html diff --git a/app/js/directives.js b/app/js/directives.js index 9c62c6f2..698535d2 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -1842,3 +1842,14 @@ angular.module('myApp.directives', ['myApp.filters']) } }) + + .directive('myAudioPlayer', function ($scope) { + + return { + link: link, + templateUrl: templateUrl('audio_player') + }; + + function link($scope, element, attrs) { + } + }) diff --git a/app/partials/desktop/audio_player.html b/app/partials/desktop/audio_player.html new file mode 100644 index 00000000..0d81ab1b --- /dev/null +++ b/app/partials/desktop/audio_player.html @@ -0,0 +1,13 @@ +
+
+ +
+
+
+
+
+
+
+ +
+
\ No newline at end of file From 8eedd88c883e253dd90f9523803d85f994e6a933 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Tue, 23 Sep 2014 11:33:50 +0400 Subject: [PATCH 2/5] Adding player --- app/index.html | 1 + app/js/app.js | 1 + app/partials/desktop/audio_player.html | 14 +- .../angular-media-player.js | 508 ++++++++++++++++++ app/webogram.appcache | 2 +- 5 files changed, 519 insertions(+), 7 deletions(-) create mode 100644 app/vendor/angular-media-player/angular-media-player.js diff --git a/app/index.html b/app/index.html index 391f44f3..e689cb35 100644 --- a/app/index.html +++ b/app/index.html @@ -50,6 +50,7 @@ + diff --git a/app/js/app.js b/app/js/app.js index 3f4f3b4a..1c0c4995 100644 --- a/app/js/app.js +++ b/app/js/app.js @@ -13,6 +13,7 @@ angular.module('myApp', [ 'ngSanitize', 'ngTouch', 'ui.bootstrap', + 'mediaPlayer', 'izhukov.utils', 'izhukov.mtproto', 'izhukov.mtproto.wrapper', diff --git a/app/partials/desktop/audio_player.html b/app/partials/desktop/audio_player.html index 0d81ab1b..b09d7d4f 100644 --- a/app/partials/desktop/audio_player.html +++ b/app/partials/desktop/audio_player.html @@ -1,13 +1,15 @@ -
-
+
+
-
-
+
+
+ +
-
- +
+
\ No newline at end of file diff --git a/app/vendor/angular-media-player/angular-media-player.js b/app/vendor/angular-media-player/angular-media-player.js new file mode 100644 index 00000000..04c9d05e --- /dev/null +++ b/app/vendor/angular-media-player/angular-media-player.js @@ -0,0 +1,508 @@ +/** + * MDN references for hackers: + * =========================== + * Media events on