Skip to content

Commit 858f76e

Browse files
Merge pull request #49 from tjenkinson/patch-1
Update for clappr v0.2.52 when properties became private
2 parents 3b97f3c + 77f4ef4 commit 858f76e

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

src/main.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ export default class RTMP extends Flash {
3535
this.options.rtmpConfig.scaling = this.options.rtmpConfig.scaling || 'letterbox'
3636
this.options.rtmpConfig.playbackType = this.options.rtmpConfig.playbackType || this.options.src.indexOf('live') > -1
3737
this.options.rtmpConfig.startLevel = this.options.rtmpConfig.startLevel === undefined ? -1 : this.options.rtmpConfig.startLevel
38-
this.setupPlaybackType()
38+
this._setupPlaybackType()
3939
}
4040

4141
getPlaybackType() {
42-
return this.playbackType
42+
return this._playbackType
4343
}
4444

4545
get swfPath() {
@@ -83,14 +83,14 @@ export default class RTMP extends Flash {
8383
}
8484

8585
addListeners() {
86-
Mediator.on(this.uniqueId + ':progress', this.progress, this)
87-
Mediator.on(this.uniqueId + ':timeupdate', this.updateTime, this)
88-
Mediator.on(this.uniqueId + ':statechanged', this.checkState, this)
89-
Mediator.on(this.uniqueId + ':playbackready', this.playbackReady, this)
90-
Mediator.on(this.uniqueId + ':onloaded', this.reporLevels, this)
91-
Mediator.on(this.uniqueId + ':levelChanging', this.levelChanging, this)
92-
Mediator.on(this.uniqueId + ':levelChanged', this.levelChange, this)
93-
Mediator.on(this.uniqueId + ':flashready', this.bootstrap, this)
86+
Mediator.on(this.uniqueId + ':progress', this._progress, this)
87+
Mediator.on(this.uniqueId + ':timeupdate', this._updateTime, this)
88+
Mediator.on(this.uniqueId + ':statechanged', this._checkState, this)
89+
Mediator.on(this.uniqueId + ':playbackready', this._playbackReady, this)
90+
Mediator.on(this.uniqueId + ':onloaded', this._reporLevels, this)
91+
Mediator.on(this.uniqueId + ':levelChanging', this._levelChanging, this)
92+
Mediator.on(this.uniqueId + ':levelChanged', this._levelChange, this)
93+
Mediator.on(this.uniqueId + ':flashready', this._bootstrap, this)
9494
}
9595

9696
stopListening() {
@@ -101,26 +101,26 @@ export default class RTMP extends Flash {
101101
Mediator.off(this.uniqueId + ':flashready')
102102
}
103103

104-
bootstrap() {
104+
_bootstrap() {
105105
this.el.width = '100%'
106106
this.el.height = '100%'
107107
this.options.autoPlay && this.play()
108-
this.setupSettings()
108+
this._setupSettings()
109109
}
110110

111-
updateTime() {
111+
_updateTime() {
112112
if (this.getPlaybackType() === 'live') {
113113
this.trigger(Events.PLAYBACK_TIMEUPDATE, {current: 1, total: 1}, this.name)
114114
} else {
115115
this.trigger(Events.PLAYBACK_TIMEUPDATE, {current: this.el.getPosition(), total: this.el.getDuration()}, this.name)
116116
}
117117
}
118118

119-
levelChanging() {
119+
_levelChanging() {
120120
this.trigger(Events.PLAYBACK_LEVEL_SWITCH_START)
121121
}
122122

123-
levelChange() {
123+
_levelChange() {
124124
this.trigger(Events.PLAYBACK_LEVEL_SWITCH_END)
125125
}
126126

@@ -130,11 +130,11 @@ export default class RTMP extends Flash {
130130
return foundLevel
131131
}
132132

133-
setupPlaybackType() {
134-
this.playbackType = this.options.rtmpConfig.playbackType
133+
_setupPlaybackType() {
134+
this._playbackType = this.options.rtmpConfig.playbackType
135135
}
136136

137-
setupSettings() {
137+
_setupSettings() {
138138
if (this.getPlaybackType() === 'live') {
139139
this.settings.left = ["playpause"]
140140
this.settings.right = ["fullscreen", "volume"]
@@ -157,16 +157,16 @@ export default class RTMP extends Flash {
157157
this.$el.attr('classid', IE_CLASSID)
158158
}
159159
} else if (Browser.isFirefox) {
160-
this.setupFirefox()
160+
this._setupFirefox()
161161
}
162162
this.el.id = this.cid
163163
var style = Styler.getStyleFor(flashStyle)
164164
this.$el.append(style)
165165
return this
166166
}
167167

168-
checkState() {
169-
super.checkState()
168+
_checkState() {
169+
super._checkState()
170170

171171
if (this.el.getState() === "PLAYING") {
172172
this.trigger(Events.PLAYBACK_PLAY, this.name)
@@ -175,12 +175,12 @@ export default class RTMP extends Flash {
175175
}
176176
}
177177

178-
playbackReady() {
179-
this.isReadyState = true
178+
_playbackReady() {
179+
this._isReadyState = true
180180
this.trigger(Events.PLAYBACK_READY, this.name)
181181
}
182182

183-
reporLevels() {
183+
_reporLevels() {
184184
if (this.isDynamicStream) {
185185
if (this.levels) {
186186
this.trigger(Events.PLAYBACK_LEVELS_AVAILABLE, this.levels, this.options.rtmpConfig.startLevel)

0 commit comments

Comments
 (0)