@lls/lls-audio 0.0.35 → 0.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lls/lls-audio",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "main": "index.js",
   "devDependencies": {
     "@kadira/storybook": "^2.21.0",

package/player/Range.js

@@ -144,7 +144,7 @@ var Range = function Range(_ref) {
             (0, _utils.timeConvert)(range.startTime) + ' - ' + (0, _utils.timeConvert)(range.endTime)
           ),
           _react2.default.createElement(_llsIcons2.default, { className: (0, _noImportant.css)(styles.delete), onClick: function onClick() {
-              return onClickDeleteRange ? onClickDeleteRange(range.id) : false;
+              return onClickDeleteRange && onClickDeleteRange(range.id);
             }, name: 'fermer' })
         );
       })

package/player/index.js

@@ -108,6 +108,7 @@ var Player = function (_Component) {
       var previousPlay = _this.state.play;
       var newPlay = newState.play;
       var _this$props = _this.props,
+          id = _this$props.id,
           src = _this$props.src,
           _this$props$on = _this$props.on,
           on = _this$props$on === undefined ? {} : _this$props$on;
@@ -116,11 +117,13 @@ var Player = function (_Component) {
 
       if (!previousPlay && newPlay && on.play) {
         on.play({
+          id: id,
           url: src
         });
       }
       if (previousPlay && !newPlay && on.pause) {
         on.pause({
+          id: id,
           url: src
         });
       }
@@ -187,7 +190,8 @@ var Player = function (_Component) {
     value: function initialize(props) {
       var _this3 = this;
 
-      var src = props.src,
+      var id = props.id,
+          src = props.src,
           _props$visible = props.visible,
           visible = _props$visible === undefined ? true : _props$visible,
           _props$on = props.on,
@@ -195,6 +199,7 @@ var Player = function (_Component) {
 
       if (on.loadStart) {
         on.loadStart({
+          id: id,
           url: src
         }); // notify start of loading
       }
@@ -206,6 +211,7 @@ var Player = function (_Component) {
         // notify end of loading
         if (on.loadSuccess) {
           on.loadSuccess({
+            id: id,
             url: src,
             duration: waveform.duration
           });
@@ -227,10 +233,6 @@ var Player = function (_Component) {
           ranges = _props$ranges === undefined ? [] : _props$ranges,
           _props$displayRange = _props.displayRange,
           displayRange = _props$displayRange === undefined ? false : _props$displayRange,
-          _props$onClickAddRang = _props.onClickAddRange,
-          onClickAddRange = _props$onClickAddRang === undefined ? false : _props$onClickAddRang,
-          _props$onClickDeleteR = _props.onClickDeleteRange,
-          onClickDeleteRange = _props$onClickDeleteR === undefined ? false : _props$onClickDeleteR,
           _props$preload = _props.preload,
           preload = _props$preload === undefined ? 'auto' : _props$preload,
           _props$caption = _props.caption,
@@ -266,8 +268,8 @@ var Player = function (_Component) {
           _react2.default.createElement(LoopWrapper, { loop: loop, audioRef: this.refs.audio }),
           displayRange && _react2.default.createElement(_Range2.default, {
             setRange: this.setRange,
-            onClickAddRange: onClickAddRange,
-            onClickDeleteRange: onClickDeleteRange,
+            onClickAddRange: on.clickAddRange,
+            onClickDeleteRange: on.clickDeleteRange,
             ranges: ranges,
             startTime: startTime,
             endTime: endTime
@@ -316,7 +318,7 @@ var Player = function (_Component) {
           _react2.default.createElement(VolumeIcon, { audioRef: this.refs.audio, volume: volume }),
           _react2.default.createElement(VolumeRange, { audioRef: this.refs.audio, volume: volume, volumeClassNames: _volumeClassNames2.default }),
           _react2.default.createElement(_llsIcons2.default, { className: 'Close ' + (0, _noImportant.css)(styles.close), onClick: function onClick() {
-              if (on.close) on.close({ url: src });
+              on.close && on.close({ url: src });
             }, name: 'fermer' }),
           caption && _react2.default.createElement(_Caption2.default, { caption: caption })
         )

package/stories/player.js

@@ -48,28 +48,37 @@ var PlayerExample = function (_Component) {
 
       var cb = {
         loadStart: function loadStart(_ref) {
-          var url = _ref.url;
-          console.log("load start");
+          var id = _ref.id,
+              url = _ref.url;
+          console.log("load start", id, url);
         },
         loadSuccess: function loadSuccess(_ref2) {
-          var url = _ref2.url,
+          var id = _ref2.id,
+              url = _ref2.url,
               duration = _ref2.duration;
-          console.log("load success", url, duration);
+          console.log("load success", id, url, duration);
         },
         play: function play(_ref3) {
-          var url = _ref3.url;
-          console.log("play", url);
+          var id = _ref3.id,
+              url = _ref3.url;
+          console.log("play", id, url);
         },
         pause: function pause(_ref4) {
-          var url = _ref4.url;
-          console.log("pause", url);
+          var id = _ref4.id,
+              url = _ref4.url;
+          console.log("pause", id, url);
+        },
+        close: function close(_ref5) {
+          var id = _ref5.id,
+              url = _ref5.url;
+          console.log("close", id, url);
         }
       };
       return _react2.default.createElement(
         'div',
         null,
-        _react2.default.createElement('input', { style: { width: 'calc(100% - 20px)', padding: 10 }, onChange: function onChange(_ref5) {
-            var value = _ref5.target.value;
+        _react2.default.createElement('input', { style: { width: 'calc(100% - 20px)', padding: 10 }, onChange: function onChange(_ref6) {
+            var value = _ref6.target.value;
             return _this2.setState({ url: value });
           }, value: this.state.url }),
         _react2.default.createElement(
@@ -86,7 +95,7 @@ var PlayerExample = function (_Component) {
             'http://lls-media-public.s3.amazonaws.com/upload/LeLivreScolaire/p15vcjbl4lvpl9l7g8ov8ammh1.mp3'
           )
         ),
-        _react2.default.createElement(_player2.default, { title: 'Audio: un audio de la BBC', on: cb, autoPlay: autoPlay, src: this.state.url, ranges: ranges, visible: true, caption: caption })
+        _react2.default.createElement(_player2.default, { id: 'test', title: 'Audio: un audio de la BBC', on: cb, autoPlay: autoPlay, src: this.state.url, ranges: ranges, visible: true, caption: caption })
       );
     }
   }]);

package/stories/playerRange.js

@@ -50,20 +50,23 @@ var PlayerExample = function (_Component) {
           ranges = _state.ranges,
           url = _state.url;
 
+      var on = {
+        clickAddRange: function clickAddRange(r) {
+          return _this2.setState({ ranges: [].concat(_toConsumableArray(ranges), [_extends({ id: ranges.length }, r)]) });
+        },
+        clickDeleteRange: function clickDeleteRange(id) {
+          return _this2.setState({ ranges: ranges.filter(function (r) {
+              return r.id != id;
+            }) });
+        }
+      };
       return _react2.default.createElement(
         'div',
         null,
         _react2.default.createElement(_player2.default, {
           src: url,
           displayRange: true,
-          onClickAddRange: function onClickAddRange(r) {
-            return _this2.setState({ ranges: [].concat(_toConsumableArray(ranges), [_extends({ id: ranges.length }, r)]) });
-          },
-          onClickDeleteRange: function onClickDeleteRange(id) {
-            return _this2.setState({ ranges: ranges.filter(function (r) {
-                return r.id != id;
-              }) });
-          },
+          on: on,
           ranges: ranges,
           visible: true
         })