rsence-pre 3.0.0.11 → 3.0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9b6d8279d4e6c4428be24337adf68655670640e
-  data.tar.gz: 0a2beb7fecc41ddb17883bd6b41bcebebc85eed1
+  metadata.gz: df0a7c946c4da900e778339d4f35f828eae3d727
+  data.tar.gz: 5ffbc7db3fca63680c7158a1dcc93fae3840ed44
 SHA512:
-  metadata.gz: 44011410d1f605a478e1e29ac4116c6235326ac5e0b80c33fe0624b2f1b6763828e3dbb600ac61a34f2bd1f90f145fd66d9b1dab1602047b7bdbf5bad5c34ecf
-  data.tar.gz: 074b547410ecac12f7ba3f9600aacbe4f966c41f6b54541f1c8fbe6d3c1bf8932324aa6a484358e117a2d0500871c7dad0d376d3a1d3e78f4c8f3759741772f1
+  metadata.gz: b20f6de1442b949062871202b89e2d935065f4e53661aefb78ed48d4481cbb036da98af5602c01e92a0857ab71ad42dfef7a2cb2c28fadac874f43c30ce8b36e
+  data.tar.gz: 1c10e07f9510879752ed756e1511035361614e7d2ab3f8eb3abf897e379974c14096f81c3d0efea20eff8d2040cb0c9d2d1085584787c2c2e1084a16997c2dec

data/VERSION

@@ -1 +1 @@
-3.0.0.11.pre
+3.0.0.12.pre

data/client/conf/client_pkg.yaml

@@ -71,6 +71,10 @@
     - mediaelement_resources  # MediaElement resources (swf and xap)
     - mediaelement_defaults   # default settings for MediaElement
 
+  mediaplayers:
+    - audioplayer
+    - videoplayer
+
   # codemirror:
   #   - codemirror        # CodeMirror
 
@@ -165,6 +169,7 @@
   media:
     - mejs_theme
     - mediaelement
+    - mediaplayers
   # code:
   #   - codemirror
   std_widgets:

data/client/js/controls/button/themes/default/button.css

@@ -25,7 +25,7 @@
   #{this.gradientCSS('#d6d6d6',[66,'#d0d0d0'],[71,'#d3d3d3'],'#cccccc')}
 }
 .default > .button_control > .button_label {
-  left: 6px; right: 6px; top: 2px; bottom: auto;
+  left: 0; right: 0; top: 2px; bottom: auto;
   text-align: center; vertical-align: middle;
   white-space: nowrap;
   overflow: hidden;

data/client/js/controls/textcontrol/themes/default/textcontrol.css

@@ -18,7 +18,7 @@
   -webkit-box-sizing: border-box;
   box-sizing:         border-box;
 }
-.default.textcontrol > .input_parent > .input::-ms-clear {
+.default.textcontrol.ie > .input_parent > .input::-ms-clear {
     display: none;
 }
 .default.textcontrol.disabled > .input_parent > .input { color: #333; }

data/client/js/core/elem/elem.coffee

@@ -291,7 +291,7 @@ ELEM = HClass.extend
     unless y?
       [ x, y ] = x
     @setStyle( _id, 'left', x+'px' )
-    @setStyle( _id, 'top', x+'px' )
+    @setStyle( _id, 'top', y+'px' )
 
   ###
   Shortcut for filling parent dimensions with optional offset(s)

data/client/js/media/audioplayer/audioplayer.coffee

@@ -0,0 +1,157 @@
+HAudioPlayer = HControl.extend
+  # componentName: 'audioplayer'
+  controlDefaults: HControlDefaults.extend
+    autoPlay: false
+    skipSeconds: 2.0
+    playLabel: '►'
+    skipBackLabel: '◀◀'
+    pauseLabel: '❙❙'
+    stopLabel: '<div class="player_stop">&#9632;</div>'
+    rewindLabel: '<span class="player_rewind0">&#9614;</span><span class="player_rewind1">&#9664;</span><span class="player_rewind2">&#9664;</span>'
+    playerFeatures: [
+      # 'play'
+      # 'pause'
+      # 'stop'
+      # 'rewind'
+      # 'skipback'
+      # 'playPause'
+      'playStop'
+      # 'mute'
+      # 'volume'
+      # 'seek'
+      # 'position'
+      # 'timeLeft'
+    ]
+  play: ->
+    @_mediaElement.play() if @_mediaElement?
+    @_playStopButton.setLabel(@options.stopLabel) if @_playStopButton?
+    @_playPauseButton.setLabel(@options.pauseLabel) if @_playPauseButton?
+  pause: ->
+    @_mediaElement.pause() if @_mediaElement?
+    _playLabel = @options.playLabel
+    @_playStopButton.setLabel(_playLabel) if @_playStopButton?
+    @_playPauseButton.setLabel(_playLabel) if @_playPauseButton?
+  seek: (_time)->
+    @_mediaElement.setCurrentTime(_time) if @_mediaElement?
+  stop: ->
+    @seek(0)
+    @pause()
+  rewind: ->
+    @seek(0)
+  skipBack: ->
+    @seek()
+  idle: ->
+    if @playing and @_mediaElement?
+      console.log('position:',@_mediaElement.currentPosition())
+  playStop: ->
+    if @playing
+      @stop()
+    else
+      @play()
+    @playing = !@playing
+  playPause: ->
+    if @playing
+      @pause()
+    else
+      @play()
+      @_playPauseButton.setLabel(@options.pauseLabel)
+    @playing = !@playing
+  _createFeatures: ->
+    for _playerFeature in @options.playerFeatures
+      @_createRewindButton()  if _playerFeature == 'rewind'
+      @_createPlayButton()  if _playerFeature == 'play'
+      @_createPauseButton()  if _playerFeature == 'pause'
+      @_createStopButton()  if _playerFeature == 'stop'
+      @_createPlayStopButton()  if _playerFeature == 'playStop'
+      @_createPlayPauseButton() if _playerFeature == 'playPause'
+  _createPlayButton: ->
+    [ x, y, w, h ] = @_playGeom
+    _opt = @options
+    _buttonLabel = _opt.playLabel
+    @_playButton = HButton.extend( click: ->@parent.play() ).new( [x,y,h,h], @,
+      label: _buttonLabel
+      enabled: false
+    )
+    @_playGeom[0] += @_playGeom[2]
+  _createPauseButton: ->
+    [ x, y, w, h ] = @_playGeom
+    _opt = @options
+    _buttonLabel = _opt.pauseLabel
+    @_pauseButton = HButton.extend( click: ->@parent.pause() ).new( [x,y,h,h], @,
+      label: _buttonLabel
+      enabled: false
+    )
+    @_playGeom[0] += @_playGeom[2]
+  _createStopButton: ->
+    [ x, y, w, h ] = @_playGeom
+    _opt = @options
+    _buttonLabel = _opt.stopLabel
+    @_stopButton = HButton.extend( click: ->@parent.stop() ).new( [x,y,h,h], @,
+      label: _buttonLabel
+      enabled: false
+    )
+    @_playGeom[0] += @_playGeom[2]
+  _createRewindButton: ->
+    [ x, y, w, h ] = @_playGeom
+    _opt = @options
+    _buttonLabel = _opt.rewindLabel
+    @_rewindButton = HButton.extend( click: ->@parent.rewind() ).new( [x,y,h,h], @,
+      label: _buttonLabel
+      enabled: false
+    )
+    @_playGeom[0] += @_playGeom[2]
+  _createPlayStopButton: ->
+    [ x, y, w, h ] = @_playGeom
+    _opt = @options
+    if @options.autoPlay
+      _buttonLabel = _opt.stopLabel
+    else
+      _buttonLabel = _opt.playLabel
+    @_playStopButton = HButton.extend( click: ->@parent.playStop() ).new( [x,y,h,h], @,
+      label: _buttonLabel
+      enabled: false
+    )
+    @_playGeom[0] += @_playGeom[2]
+  _createPlayPauseButton: ->
+    [ x, y, w, h ] = @_playGeom
+    _opt = @options
+    if @options.autoPlay
+      _buttonLabel = _opt.pauseLabel
+    else
+      _buttonLabel = _opt.playLabel
+    @_playPauseButton = HButton.extend( click: ->@parent.playPause() ).new( [x,y,h,h], @,
+      label: _buttonLabel
+      enabled: false
+    )
+    @_playGeom[0] += @_playGeom[2]
+  _enableAll: (_state)->
+    @_playStopButton.setEnabled(_state) if @_playStopButton?
+    @_playPauseButton.setEnabled(_state) if @_playPauseButton?
+    @_playButton.setEnabled(_state) if @_playButton?
+    @_pauseButton.setEnabled(_state) if @_pauseButton?
+    @_stopButton.setEnabled(_state) if @_stopButton?
+    @_rewindButton.setEnabled(_state) if @_rewindButton?
+  _mediaLoaded: (_mediaElement, _domObject)->
+    @playing = @options.autoPlay
+    @play() if @playing
+    @_enableAll( @enabled )
+  _mediaFailed: ->
+    console.log('HAudioPlayer media failure:',arguments)
+  die: ->
+    @stop()
+    ELEM.del(@_audioElementId)
+    @base()
+  extDraw: ->
+    _opt = @options
+    @_playGeom = [0,0,@rect.height,@rect.height]
+    @_mediaElement = null
+    @_createFeatures()
+    @_audioElementId = ELEM.make(@elemId,'audio',{attr:{src:@value}})
+    _audioElement = ELEM.get(@_audioElementId)
+    try
+      @_mediaElement = new MediaElement(_audioElement,
+        success: => @_mediaLoaded()
+        error: => @_mediaFailed()
+      )
+    catch e
+      console.log('MediaElement init error:',e)

data/client/js/media/audioplayer/themes/default/audioplayer.css

@@ -0,0 +1,14 @@
+.default > .button_control > .button_label > .player_stop {
+  margin-left: -0.05em; font-size: 1.4em; line-height: 1em;
+}
+.default > .button_control > .button_label > .player_rewind0,
+.default > .button_control > .button_label > .player_rewind1,
+.default > .button_control > .button_label > .player_rewind2 {
+  text-shadow: none;
+}
+.default > .button_control > .button_label > .player_rewind1 {
+  margin-left: -1.15em;
+}
+.default > .button_control > .button_label > .player_rewind2 {
+  margin-left: -0.6em;
+}

data/client/js/media/mediaelement_defaults/mediaelement_defaults.coffee

@@ -1 +1 @@
-LOAD(-> mejs.MediaElementDefaults.pluginPath = HThemeManager.themePaths.mejs )
+(-> mejs.MediaElementDefaults.pluginPath = HThemeManager.themePaths.mejs )()

data/lib/rsence/http/request.rb

@@ -1,6 +1,6 @@
 
 module RSence
-  
+
   # Simple Request class, slightly more involved
   # than the Rack::Request it's extending.
   class Request < Rack::Request
@@ -20,38 +20,26 @@ module RSence
     def unparsed_uri
       return @header['request-uri']
     end
+    @@env_transl = {
+      'SERVER_NAME'     => 'server-name',
+      'PATH_INFO'       => 'path-info',
+      'SERVER_PROTOCOL' => 'server-protocol',
+      'REQUEST_PATH'    => 'request-path',
+      'SERVER_SOFTWARE' => 'server-software',
+      'REMOTE_ADDR'     => 'remote-addr',
+      'REQUEST_URI'     => 'request-uri',
+      'SERVER_PORT'     => 'server-port',
+      'QUERY_STRING'    => 'query-string',
+      'REQUEST_METHOD'  => 'request-method'
+    }
     def env2header
-      [ ['SERVER_NAME',           'server-name'],
-        ['HTTP_USER_AGENT',       'user-agent'],
-        ['HTTP_ACCEPT_ENCODING',  'accept-encoding'],
-        ['PATH_INFO',             'path-info'],
-        ['HTTP_HOST',             'host'],
-        ['HTTP_ACCEPT_LANGUAGE',  'accept-language'],
-        ['SERVER_PROTOCOL',       'server-protocol'],
-        ['REQUEST_PATH',          'request-path'],
-        ['HTTP_KEEP_ALIVE',       'keep-alive'],
-        ['SERVER_SOFTWARE',       'server-software'],
-        ['REMOTE_ADDR',           'remote-addr'],
-        ['HTTP_REFERER',          'referer'],
-        ['HTTP_VERSION',          'version'],
-        ['HTTP_ACCEPT_CHARSET',   'accept-charset'],
-        ['REQUEST_URI',           'request-uri'],
-        ['SERVER_PORT',           'server-port'],
-        ['QUERY_STRING',          'query-string'],
-        ['HTTP_ACCEPT',           'accept'],
-        ['REQUEST_METHOD',        'request-method'],
-        ['HTTP_CONNECTION',       'connection'],
-        ['HTTP_SOAPACTION',       'soapaction'],
-        ['HTTP_FORWARDED_HOST',   'forwarded-host']
-      ].each do |env_key,header_key|
-        if @env.has_key?(env_key)
-          @header[header_key] = @env[env_key]
-        end
-        if env_key.start_with?( 'HTTP_' )
-          x_env_key = "HTTP_X#{env_key[4..-1]}"
-          if @env.has_key?( x_env_key )
-            @header["x-#{header_key}"] = @env[ x_env_key ]
-          end
+      @env.each do |env_key,env_val|
+        if @@env_transl.has_key?(env_key)
+          http_key = @@env_transl[env_key]
+          @header[http_key] = @env[env_key]
+        elsif env_key.start_with?( 'HTTP_' )
+          http_key = env_key[4..-1].gsub(/_([A-Z0-9]+)/) {|m|'-'+$1.downcase}[1..-1]
+          @header[http_key] = @env[env_key]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rsence-pre
 version: !ruby/object:Gem::Version
-  version: 3.0.0.11
+  version: 3.0.0.12
 platform: ruby
 authors:
 - Riassence Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsence-deps
@@ -272,6 +272,9 @@ files:
 - client/js/lists/propertylist/propertylist.js
 - client/js/lists/propertylist/propertylisteditor/propertylisteditor.js
 - client/js/lists/radiobuttonlist/radiobuttonlist.js
+- client/js/media/audioplayer/audioplayer.coffee
+- client/js/media/audioplayer/themes/default/audioplayer.css
+- client/js/media/audioplayer/themes/default/audioplayer.html
 - client/js/media/mediaelement/mediaelement.js
 - client/js/media/mediaelement_defaults/mediaelement_defaults.coffee
 - client/js/media/mediaelement_resources/mediaelement_resources.js