rsence-pre 2.2.0.5 → 2.2.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (92) hide show
  1. data/VERSION +1 -1
  2. data/conf/default_conf.yaml +1 -10
  3. data/js/controls/uploader/themes/default/uploader.html +1 -1
  4. data/js/controls/uploader/uploader.js +27 -19
  5. data/js/controls/window/themes/default/window.css +15 -1
  6. data/js/controls/window/themes/default/window.html +2 -0
  7. data/js/datetime/calendar/calendar.js +18 -4
  8. data/js/foundation/locale_settings/locale_settings.js +2 -0
  9. data/js/foundation/view/view.js +65 -0
  10. data/lib/conf/argv.rb +54 -5
  11. data/lib/conf/default.rb +12 -4
  12. data/lib/plugins/gui_plugin.rb +6 -3
  13. data/lib/plugins/pluginmanager.rb +8 -1
  14. data/lib/transporter/transporter.rb +6 -3
  15. data/plugins/client_pkg/client_pkg.rb +1 -0
  16. data/plugins/client_pkg/info.yaml +2 -2
  17. data/plugins/client_pkg/lib/client_pkg_build.rb +1 -2
  18. metadata +5 -81
  19. data/js/comm/autosync/js.inc +0 -0
  20. data/js/comm/js.inc +0 -0
  21. data/js/comm/jsloader/js.inc +0 -0
  22. data/js/comm/queue/js.inc +0 -0
  23. data/js/comm/session/js.inc +0 -0
  24. data/js/comm/sessionwatcher/js.inc +0 -0
  25. data/js/comm/transporter/js.inc +0 -0
  26. data/js/comm/urlresponder/js.inc +0 -0
  27. data/js/comm/values/js.inc +0 -0
  28. data/js/controls/button/js.inc +0 -0
  29. data/js/controls/checkbox/js.inc +0 -0
  30. data/js/controls/dialogs/alert_sheet/js.inc +0 -0
  31. data/js/controls/dialogs/confirm_sheet/js.inc +0 -0
  32. data/js/controls/dialogs/sheet/js.inc +0 -0
  33. data/js/controls/imageview/js.inc +0 -0
  34. data/js/controls/passwordcontrol/js.inc +0 -0
  35. data/js/controls/progress/progressbar/js.inc +0 -0
  36. data/js/controls/progress/progressindicator/js.inc +0 -0
  37. data/js/controls/radiobutton/js.inc +0 -0
  38. data/js/controls/sliders/slider/js.inc +0 -0
  39. data/js/controls/sliders/vslider/js.inc +0 -0
  40. data/js/controls/stepper/js.inc +0 -0
  41. data/js/controls/stringview/js.inc +0 -0
  42. data/js/controls/tab/js.inc +0 -0
  43. data/js/controls/textarea/js.inc +0 -0
  44. data/js/controls/textcontrol/js.inc +0 -0
  45. data/js/controls/uploader/js.inc +0 -0
  46. data/js/controls/validatorview/js.inc +0 -0
  47. data/js/controls/window/js.inc +0 -0
  48. data/js/core/class/js.inc +0 -0
  49. data/js/core/elem/js.inc +0 -0
  50. data/js/core/event/js.inc +0 -0
  51. data/js/core/iefix/js.inc +0 -0
  52. data/js/core/rsence_ns/js.inc +0 -0
  53. data/js/datetime/calendar/js.inc +0 -0
  54. data/js/datetime/datetimepicker/js.inc +0 -0
  55. data/js/datetime/datetimevalue/js.inc +0 -0
  56. data/js/datetime/timesheet/js.inc +0 -0
  57. data/js/datetime/timesheet_item/js.inc +0 -0
  58. data/js/datetime/timesheet_item_edit/js.inc +0 -0
  59. data/js/foundation/application/js.inc +0 -0
  60. data/js/foundation/control/controldefaults/js.inc +0 -0
  61. data/js/foundation/control/dummyvalue/js.inc +0 -0
  62. data/js/foundation/control/dyncontrol/js.inc +0 -0
  63. data/js/foundation/control/eventresponder/js.inc +0 -0
  64. data/js/foundation/control/js.inc +0 -0
  65. data/js/foundation/control/valueaction/js.inc +0 -0
  66. data/js/foundation/control/valuematrix/js.inc +0 -0
  67. data/js/foundation/control/valueresponder/js.inc +0 -0
  68. data/js/foundation/eventmanager/js.inc +0 -0
  69. data/js/foundation/geom/point/js.inc +0 -0
  70. data/js/foundation/geom/rect/js.inc +0 -0
  71. data/js/foundation/json_renderer/js.inc +0 -0
  72. data/js/foundation/locale_settings/js.inc +0 -0
  73. data/js/foundation/system/js.inc +0 -0
  74. data/js/foundation/thememanager/js.inc +0 -0
  75. data/js/foundation/value/js.inc +0 -0
  76. data/js/foundation/view/js.inc +0 -0
  77. data/js/foundation/view/markupview/js.inc +0 -0
  78. data/js/foundation/view/morphanimation/js.inc +0 -0
  79. data/js/foundation/view/viewdefaults/js.inc +0 -0
  80. data/js/graphics/svgcontrol/js.inc +0 -0
  81. data/js/lists/checkboxlist/js.inc +0 -0
  82. data/js/lists/listitems/js.inc +0 -0
  83. data/js/lists/propertylist/js.inc +0 -0
  84. data/js/lists/propertylist/propertylisteditor/js.inc +0 -0
  85. data/js/lists/radiobuttonlist/js.inc +0 -0
  86. data/js/menus/minimenu/js.inc +0 -0
  87. data/js/menus/minimenu/minimenuitem/js.inc +0 -0
  88. data/js/util/reloadapp/js.inc +0 -0
  89. data/js/util/sha/js.inc +0 -0
  90. data/js/views/centerview/js.inc +0 -0
  91. data/js/views/inlineview/js.inc +0 -0
  92. data/js/views/scrollview/js.inc +0 -0
data/VERSION CHANGED
@@ -1 +1 @@
1
- 2.2.0.5.pre
1
+ 2.2.0.7.pre
@@ -191,13 +191,7 @@
191
191
 
192
192
  # Source directories to scan
193
193
  :src_dirs: []
194
-
195
- # RSence Client Framework
196
- #- js
197
-
198
- # How to include your own custom js package directory:
199
- # - /home/me/code/extra_components
200
-
194
+
201
195
  # List of theme names to include and pack
202
196
  :theme_names:
203
197
  - default # Makes default_theme.js containing css and html templates
@@ -349,9 +343,6 @@
349
343
  - .svg
350
344
  - .pdf
351
345
 
352
- # The name of the include file
353
- :js_inc: js.inc
354
-
355
346
  # If disabled, makes packages out of single source bundles automatically
356
347
  :dont_pack_undefined: true
357
348
 
@@ -15,7 +15,7 @@
15
15
  <div class="button_edge_left"></div>
16
16
  <div class="button_center"></div>
17
17
  <div class="button_edge_right"></div>
18
- <div class="button_label">OK</div>
18
+ <div class="button_label">#{this.getLocaleString('HUploader.strings.ok')}</div>
19
19
  <div class="button_antiselect"></div>
20
20
  </div>
21
21
  <form id="form#{this.elemId}" name="upload_form_#{this.elemId}" enctype="multipart/form-data" method="POST" action="/U/NoUploadKey" target="upload_target_#{this.elemId}" class="uploader_form">
@@ -13,27 +13,32 @@
13
13
  *
14
14
  **/
15
15
 
16
+ HLocale.components.HUploader = {
17
+ strings: {
18
+ stateLabels: {
19
+
20
+ // -- Upload success states: ++
21
+ '0': "Select file...",
22
+ '1': "Uploading...",
23
+ '2': "Processing data...",
24
+ '3': "Upload Complete",
25
+ '4': "Preparing upload",
26
+
27
+ // -- Upload failure states: ++
28
+ '-1': "Error: Invalid request",
29
+ '-2': "Error: Invalid upload key",
30
+ '-3': "Error: Invalid data format",
31
+ '-4': "Error: File too big",
32
+ '-6': "Error: Post-processing failed"
33
+ }
34
+ }
35
+ };
36
+
16
37
  var//RSence.Controls
17
38
  HUploader = HControl.extend({
18
39
  componentName: 'uploader',
19
40
  uploadState: false,
20
41
  uploadKey: false,
21
- uploadStateLabels: {
22
-
23
- // -- Upload success states: ++
24
- '0': "Select file...",
25
- '1': "Uploading...",
26
- '2': "Processing data...",
27
- '3': "Upload Complete",
28
- '4': "Preparing upload",
29
-
30
- // -- Upload failure states: ++
31
- '-1': "Error: Invalid request",
32
- '-2': "Error: Invalid upload key",
33
- '-3': "Error: Invalid data format",
34
- '-4': "Error: File too big",
35
- '-6': "Error: Post-processing failed"
36
- },
37
42
  markupElemNames: [
38
43
  'form',
39
44
  'file',
@@ -58,11 +63,14 @@ HUploader = HControl.extend({
58
63
  setUploadState: function(_state,_uploadKey){
59
64
  if(_state!==this.uploadState){
60
65
  this.uploadState = _state;
61
- var _stateKey = _state.toString();
66
+ var
67
+ _stateKey = _state.toString(),
68
+ _stateLabels = HLocale.components.HUploader.strings.stateLabels,
69
+ _label;
62
70
  //console.log('stateKey:',_stateKey);
63
- if(this.uploadStateLabels[_stateKey]!==undefined){
71
+ if(_stateLabels[_stateKey]!==undefined){
64
72
  ELEM.get(this.markupElemIds.value).value=this.valueObj.id;
65
- var _label = this.uploadStateLabels[_stateKey];
73
+ _label = _stateLabels[_stateKey];
66
74
  //console.log('stateLabel:',_label);
67
75
  if(_state===0){
68
76
  ELEM.setStyle(this.markupElemIds.upload_progress,'visibility','hidden');
@@ -1,5 +1,5 @@
1
1
 
2
-
2
+ .window_shadow,
3
3
  .window_titlebar,
4
4
  .window_titlebar_edge_left,
5
5
  .window_titlebar_center,
@@ -24,6 +24,20 @@
24
24
  background-repeat: no-repeat;
25
25
  }
26
26
 
27
+ .window_shadow {
28
+ left: 4px; right: 4px; top: 4px; bottom: 4px;
29
+ overflow: visible;
30
+ -moz-box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
31
+ -webkit-box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
32
+ box-shadow: 3px 3px 20px #333, 3px 3px 10px #000;
33
+ }
34
+
35
+ .inactive .window_shadow {
36
+ -moz-box-shadow: 3px 3px 13px #333;
37
+ -webkit-box-shadow: 3px 3px 13px #333;
38
+ box-shadow: 3px 3px 13px #333;
39
+ }
40
+
27
41
  .window_controls * {
28
42
  cursor: pointer;
29
43
  }
@@ -1,3 +1,5 @@
1
+ ${this.setStyle('overflow','visible')}
2
+ <div class="window_shadow"></div>
1
3
  <div class="window_titlebar">
2
4
  <div class="window_titlebar_edge_left"></div>
3
5
  <div class="window_titlebar_center"></div>
@@ -14,9 +14,17 @@
14
14
  var//RSence.DateTime
15
15
  HCalendar = HControl.extend({
16
16
  componentName: 'calendar',
17
- weekdays_localized: ['Wk','Mon','Tue','Wed','Thu','Fri','Sat','Sun'],
17
+ weekdaysLocalized: function(){
18
+ var
19
+ _localeStrings = HLocale.dateTime.strings,
20
+ _outputArray = COMM.Values.clone( _localeStrings.weekDaysShort );
21
+ _outputArray.push( _outputArray.shift() );
22
+ _outputArray.unshift( _localeStrings.weekShort );
23
+ return _outputArray;
24
+ },//['Wk','Mon','Tue','Wed','Thu','Fri','Sat','Sun'],
18
25
  defaultEvents: {
19
- mouseWheel: true
26
+ mouseWheel: true,
27
+ click: true
20
28
  },
21
29
  /** = Description
22
30
  * Calls HCalendar#nextMonth or HCalendar#prevMonth based on delta
@@ -32,6 +40,12 @@ HCalendar = HControl.extend({
32
40
  }
33
41
  },
34
42
 
43
+ /** = Description
44
+ * Simple clickthrouct
45
+ click: function(){
46
+ return false;
47
+ },
48
+
35
49
  /** = Description
36
50
  * Refreshes weekdays.
37
51
  *
@@ -40,7 +54,7 @@ HCalendar = HControl.extend({
40
54
  if(!this['markupElemIds']){
41
55
  return;
42
56
  }
43
- var _weekdays_localized = this.weekdays_localized,
57
+ var _weekdays_localized = this.weekdaysLocalized(),
44
58
  _weekdays_width = Math.floor(this.rect.width/_weekdays_localized.length),
45
59
  _weekdays_html = [],
46
60
  i = 0,
@@ -132,7 +146,7 @@ HCalendar = HControl.extend({
132
146
  _monthLast = this.lastDateOfMonth(_date),
133
147
  _firstDate = _calendarDateRange[0],
134
148
  _lastDate = _calendarDateRange[1],
135
- _column_count = this.weekdays_localized.length,
149
+ _column_count = this.weekdaysLocalized().length,
136
150
  _column_width = Math.floor((this.rect.width-1)/_column_count),
137
151
  _row_height = Math.floor((this.rect.height-1-35)/6),
138
152
  _week_html_pre = ['<div class="calendar_weeks_week_row" style="width:'+(this.rect.width-3)+'px;height:'+_row_height+'px;top:','px">'],
@@ -15,6 +15,8 @@ HLocale = {
15
15
  strings: {
16
16
  weekDaysLong: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ],
17
17
  weekDaysShort: [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ],
18
+ weekLong: 'Week',
19
+ weekShort: 'WK',
18
20
  dateDelimitter: '.',
19
21
  timeDelimitter: ':',
20
22
  timeMsDelimitter: '.',
@@ -1843,6 +1843,71 @@ HView = HClass.extend({
1843
1843
  ELEM.del(_elementId);
1844
1844
  this._domElementBindings.splice(_indexOfElementId, 1);
1845
1845
  }
1846
+ },
1847
+
1848
+
1849
+ /** = Description
1850
+ * Finds a string from the locale of the component.
1851
+ * The attrPath is a string or array to find an object.
1852
+ * For instance, if a component has a structure like this defined:
1853
+ * HLocale.components.FooComponent = {
1854
+ * strings: {
1855
+ * defaultLabel: 'Default Label',
1856
+ * otherLabel: 'Other Label',
1857
+ * }
1858
+ * };
1859
+ *
1860
+ * To get the defaultLabel, call getLocaleString like this:
1861
+ * this.getLocaleString( 'FooComponent', 'strings.defaultLabel' );
1862
+ * ..or:
1863
+ * this.getLocaleString( 'FooComponent', ['strings','defaultLabel'] );
1864
+ * ..or:
1865
+ * this.getLocaleString( 'FooComponent.strings.defaultLabel' );
1866
+ *
1867
+ * = Parameters
1868
+ * +_componentClassName+:: The name of the item in HLocale.components
1869
+ * +_attrPath+:: The object path to the string. String or Array.
1870
+ * +_default+:: The default object to return if nothing matched.
1871
+ *
1872
+ **/
1873
+ getLocaleString: function( _componentClassName, _attrPath, _default ){
1874
+ if( _default === undefined ){
1875
+ _default = '';
1876
+ }
1877
+ var
1878
+ _searchTarget = HLocale.components[_componentClassName],
1879
+ _key;
1880
+ if( _searchTarget === undefined && (typeof _componentClassName === 'string') ){
1881
+ _searchTarget = HLocale.components;
1882
+ _attrPath = _componentClassName;
1883
+ _default = _attrPath;
1884
+ }
1885
+ if( typeof _attrPath === 'string' ){
1886
+ if( _attrPath.indexOf( '.' ) > 0 ){
1887
+ _attrPath = _attrPath.split('.');
1888
+ }
1889
+ else {
1890
+ _attrPath = [ _attrPath ];
1891
+ }
1892
+ }
1893
+ if( _searchTarget[ _attrPath[0] ] === undefined ){
1894
+ _searchTarget = HLocale;
1895
+ }
1896
+ if( _searchTarget[ _attrPath[0] ] === undefined ){
1897
+ return _default;
1898
+ }
1899
+ for( _key in _attrPath ){
1900
+ if( typeof _searchTarget[_key] === 'object' ){
1901
+ _searchTarget = _searchTarget[_key];
1902
+ }
1903
+ else if( typeof _searchTarget[_key] === 'string' ){
1904
+ return _searchTarget[_key];
1905
+ }
1906
+ else {
1907
+ return _default;
1908
+ }
1909
+ }
1910
+ return _default;
1846
1911
  }
1847
1912
 
1848
1913
 
data/lib/conf/argv.rb CHANGED
@@ -220,7 +220,7 @@ module RSence
220
220
  end
221
221
  if valid_env?(@args[:env_path])
222
222
  conf_file = File.expand_path( File.join( @args[:env_path], 'conf', 'config.yaml' ) )
223
- @args[:conf_files].push( conf_file ) unless @args[:conf_files].include?( conf_file )
223
+ @args[:conf_files].unshift( conf_file ) unless @args[:conf_files].include?( conf_file )
224
224
  else
225
225
  invalid_env
226
226
  end
@@ -412,7 +412,7 @@ module RSence
412
412
  end
413
413
  elsif valid_env?(arg)
414
414
  @args[:env_path] = File.expand_path(arg)
415
- @args[:conf_files].push( File.expand_path( File.join( arg, 'conf', 'config.yaml' ) ) )
415
+ @args[:conf_files].unshift( File.expand_path( File.join( arg, 'conf', 'config.yaml' ) ) )
416
416
  else
417
417
  invalid_env( arg )
418
418
  end
@@ -425,7 +425,7 @@ module RSence
425
425
  end
426
426
  if valid_env?(@args[:env_path])
427
427
  conf_file = File.expand_path( File.join( @args[:env_path], 'conf', 'config.yaml' ) )
428
- @args[:conf_files].push( conf_file ) unless @args[:conf_files].include?( conf_file )
428
+ @args[:conf_files].unshift( conf_file ) unless @args[:conf_files].include?( conf_file )
429
429
  else
430
430
  invalid_env
431
431
  end
@@ -512,7 +512,7 @@ module RSence
512
512
  end
513
513
  elsif valid_env?(arg)
514
514
  @args[:env_path] = File.expand_path(arg)
515
- @args[:conf_files].push( File.expand_path( File.join( arg, 'conf', 'config.yaml' ) ) )
515
+ @args[:conf_files].unshift( File.expand_path( File.join( arg, 'conf', 'config.yaml' ) ) )
516
516
  else
517
517
  invalid_env( arg )
518
518
  end
@@ -525,7 +525,7 @@ module RSence
525
525
  end
526
526
  if valid_env?(@args[:env_path])
527
527
  conf_file = File.expand_path( File.join( @args[:env_path], 'conf', 'config.yaml' ) )
528
- @args[:conf_files].push( conf_file ) unless @args[:conf_files].include?( conf_file )
528
+ @args[:conf_files].unshift( conf_file ) unless @args[:conf_files].include?( conf_file )
529
529
  else
530
530
  invalid_env
531
531
  end
@@ -875,6 +875,55 @@ module RSence
875
875
  def self.config
876
876
  @@config
877
877
  end
878
+
879
+ def self.transporter
880
+ @@transporter
881
+ end
882
+ def self.transporter=(transporter)
883
+ if class_variable_defined?(:'@@transporter')
884
+ warn "WARN: Transporter already set."
885
+ return
886
+ else
887
+ @@transporter = transporter
888
+ end
889
+ end
890
+
891
+ def self.plugin_manager
892
+ @@plugin_manager
893
+ end
894
+ def self.plugin_manager=(plugin_manager)
895
+ if class_variable_defined?(:'@@plugin_manager')
896
+ warn "WARN: @@plugin_manager already set."
897
+ return
898
+ else
899
+ @@plugin_manager = plugin_manager
900
+ end
901
+ end
902
+
903
+ def self.value_manager
904
+ @@value_manager
905
+ end
906
+ def self.value_manager=(value_manager)
907
+ if class_variable_defined?(:'@@value_manager')
908
+ warn "WARN: @@value_manager already set."
909
+ return
910
+ else
911
+ @@value_manager = value_manager
912
+ end
913
+ end
914
+
915
+ def self.session_manager
916
+ @@session_manager
917
+ end
918
+ def self.session_manager=(session_manager)
919
+ if class_variable_defined?(:'@@session_manager')
920
+ warn "WARN: @@session_manager already set."
921
+ return
922
+ else
923
+ @@session_manager = session_manager
924
+ end
925
+ end
926
+
878
927
  ## Riassence Daemon controls
879
928
  require 'daemon/daemon'
880
929
  puts "Starting RSence..." if self.args[:verbose]
data/lib/conf/default.rb CHANGED
@@ -45,7 +45,7 @@ module RSence
45
45
  # @param [Hash] source Has its items merged to `target` unless a key with an identical value already exists in `target`. If an item class is Array, then uses {#array_merge} to combine them.
46
46
  def hash_merge( target, source )
47
47
  source.each do |key,item|
48
- if not target.has_key?key or target[key] != item
48
+ if not target.has_key?( key ) or target[key] != item
49
49
  if item.class == Array
50
50
  target[key] = [] unless target.has_key?(key)
51
51
  array_merge( target[key], item )
@@ -149,9 +149,17 @@ module RSence
149
149
  config[:client_pkg][:no_whitespace_removal] = true if args[:client_pkg_no_whitespace_removal]
150
150
 
151
151
  # Sets the default pid and log paths used by the HTTPDaemon
152
- config[:daemon][:pid_fn] = File.join(pidpath, "rsence.pid") unless config[:daemon].has_key?(:pid_fn)
153
- config[:daemon][:log_fn] = File.join(logpath, "rsence") unless config[:daemon].has_key?(:log_fn)
154
-
152
+ if config[:daemon].has_key?(:pid_fn)
153
+ config[:daemon][:pid_fn] = File.join(pidpath, config[:daemon][:pid_fn] )
154
+ else
155
+ config[:daemon][:pid_fn] = File.join(pidpath, "rsence.pid")
156
+ end
157
+ if config[:daemon].has_key?(:log_fn)
158
+ config[:daemon][:log_fn] = File.join(logpath, config[:daemon][:log_fn] )
159
+ else
160
+ config[:daemon][:log_fn] = File.join(logpath, "rsence")
161
+ end
162
+
155
163
  # Check database path for sqlite databases.
156
164
  if config[:database][:ses_db].start_with?('sqlite://') and not dont_expand_path
157
165
  db_url = File.expand_path( config[:database][:ses_db].split('sqlite://')[1], args[:env_path] )
@@ -34,9 +34,12 @@ module RSence
34
34
  # @return [nil]
35
35
  def init
36
36
  super
37
- yaml_src = file_read( "gui/#{@name}.yaml" )
38
- unless yaml_src
39
- yaml_src = file_read( "gui/main.yaml" )
37
+ yaml_src = false
38
+ [ "#{@name}.yaml", 'gui.yaml',
39
+ "gui/#{@name}.yaml", "gui/main.yaml"
40
+ ].each do |yaml_name|
41
+ yaml_src = file_read( yaml_name )
42
+ break if yaml_src
40
43
  end
41
44
  if yaml_src
42
45
  @gui = GUIParser.new( self, yaml_src, @name )
@@ -27,6 +27,9 @@ module RSence
27
27
  def incr
28
28
  return @@incr
29
29
  end
30
+ def incr!
31
+ @@incr += 1
32
+ end
30
33
 
31
34
  # Returns the registry data for plugin bundle +plugin_name+
32
35
  def registry( plugin_name=false )
@@ -615,7 +618,7 @@ module RSence
615
618
  puts "done!" if RSence.args[:verbose]
616
619
  end
617
620
  if not (to_load.empty? and to_unload.empty? and to_reload.empty?)
618
- @@incr += 1
621
+ incr!
619
622
  puts "@@incr: #{@@incr}" if RSence.args[:debug]
620
623
  puts "Plugin bundles:"
621
624
  puts " loaded: #{to_load.join(', ')}" unless to_load.empty?
@@ -672,6 +675,10 @@ module RSence
672
675
  @name_prefix = options[:name_prefix]
673
676
  @parent_manager = options[:parent_manager]
674
677
 
678
+ if @parent_manager == nil
679
+ RSence.plugin_manager = self
680
+ end
681
+
675
682
  @deps = Dependencies.new( options[:resolved_deps], options[:resolved_categories] )
676
683
 
677
684
  puts "Loading #{@name_prefix.to_s+' ' if @name_prefix}plugins..." if RSence.args[:verbose]
@@ -36,6 +36,7 @@ module RSence
36
36
  attr_accessor :plugins
37
37
 
38
38
  def initialize
39
+ RSence.transporter = self
39
40
  @config = RSence.config[:transporter_conf]
40
41
  @accept_req = false
41
42
  core_pkgs = {
@@ -50,7 +51,9 @@ module RSence
50
51
  :resolved_categories => core_pkgs
51
52
  })
52
53
  @valuemanager = ValueManager.new
54
+ RSence.value_manager = @valuemanager
53
55
  @sessions = SessionManager.new( self )
56
+ RSence.session_manager = @sessions
54
57
  if RSence.config[:session_conf][:reset_sessions]
55
58
  puts "Resetting all sessions..."
56
59
  @sessions.reset_sessions()
@@ -200,7 +203,7 @@ module RSence
200
203
 
201
204
  begin
202
205
  @plugins.delegate( :restore_ses, msg )
203
- msg.session[:plugin_incr] == @plugins.incr
206
+ msg.session[:plugin_incr] = @plugins.incr
204
207
  rescue => e
205
208
  response_success = false
206
209
  xhr_error_handler( msg, :plugin_delegate_restore_ses_error, e.message )
@@ -211,7 +214,7 @@ module RSence
211
214
 
212
215
  begin
213
216
  @plugins.delegate( :init_ses, msg )
214
- msg.session[:plugin_incr] == @plugins.incr
217
+ msg.session[:plugin_incr] = @plugins.incr
215
218
  rescue => e
216
219
  response_success = false
217
220
  xhr_error_handler( msg, :plugin_delegate_init_ses_error, e.message )
@@ -230,7 +233,7 @@ module RSence
230
233
 
231
234
  elsif msg.refresh_page?( @plugins.incr ) and @config[:client_autoreload]
232
235
  while msg.refresh_page?( @plugins.incr )
233
- msg.session[:plugin_incr] == @plugins.incr
236
+ msg.session[:plugin_incr] = @plugins.incr
234
237
  sleep 0.5
235
238
  end
236
239
  # Forces the client to reload, if plugins are incremented
@@ -64,6 +64,7 @@ class ClientPkgPlugin < Servlet
64
64
  @client_build.setup_dirs
65
65
  @client_build.run
66
66
  @client_cache.set_cache( @client_build.js, @client_build.gz, @client_build.themes )
67
+ RSence.plugin_manager.incr! if RSence.config[:transporter_conf][:client_autoreload]
67
68
  @build_busy = false
68
69
  end
69
70
 
@@ -3,7 +3,7 @@
3
3
  title: Client Resource Package
4
4
 
5
5
  # The human-readable version of the package
6
- version: 2.1.0
6
+ version: 2.2.0
7
7
 
8
8
  # A brief description of the package (rdoc formatting supported)
9
9
  description: |
@@ -17,7 +17,7 @@ description: |
17
17
  reloadable: false
18
18
 
19
19
  # System version requirement.
20
- sys_version: '>= 2.1.0'
20
+ sys_version: '>= 2.2.0'
21
21
 
22
22
  category: :system
23
23
 
@@ -157,7 +157,7 @@ class ClientPkgBuild
157
157
  # the name of src_dir (src_dir itself is a full path)
158
158
  dir_name = File.split( src_dir )[1]
159
159
  # bundles are defined as directories with a js file of the same name plus the 'js.inc' tagfile
160
- is_bundle = dir_entries.include?( @js_inc ) and dir_entries.include?( dir_name+'.js' )
160
+ is_bundle = ( not dir_entries.include?( 'disabled' ) ) and ( dir_entries.include?( dir_name+'.js' ) or dir_entries.include?( 'main.js' ) )
161
161
  # if src_dir is detected as a bundle, handle it in add_bundle
162
162
  if is_bundle
163
163
  add_bundle( dir_name, src_dir, dir_entries )
@@ -502,7 +502,6 @@ class ClientPkgBuild
502
502
  @no_gzip = config[:no_gzip]
503
503
  @no_obfuscation = config[:no_obfuscation]
504
504
  @no_whitespace_removal = config[:no_whitespace_removal]
505
- @js_inc = config[:js_inc]
506
505
  @debug = RSence.args[:debug]
507
506
  @quiet = (not RSence.args[:verbose])
508
507
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rsence-pre
3
3
  version: !ruby/object:Gem::Version
4
- hash: 117
4
+ hash: 113
5
5
  prerelease:
6
6
  segments:
7
7
  - 2
8
8
  - 2
9
9
  - 0
10
- - 5
11
- version: 2.2.0.5
10
+ - 7
11
+ version: 2.2.0.7
12
12
  platform: ruby
13
13
  authors:
14
14
  - Riassence Inc.
@@ -16,8 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2011-04-01 00:00:00 +03:00
20
- default_executable: rsence-pre
19
+ date: 2011-05-23 00:00:00 Z
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
23
22
  name: rsence-deps
@@ -109,25 +108,15 @@ files:
109
108
  - plugins/ticket/lib/upload.rb
110
109
  - plugins/ticket/ticket.rb
111
110
  - js/comm/autosync/autosync.js
112
- - js/comm/autosync/js.inc
113
111
  - js/comm/comm.js
114
- - js/comm/js.inc
115
- - js/comm/jsloader/js.inc
116
112
  - js/comm/jsloader/jsloader.js
117
- - js/comm/queue/js.inc
118
113
  - js/comm/queue/queue.js
119
- - js/comm/session/js.inc
120
114
  - js/comm/session/session.js
121
- - js/comm/sessionwatcher/js.inc
122
115
  - js/comm/sessionwatcher/sessionwatcher.js
123
- - js/comm/transporter/js.inc
124
116
  - js/comm/transporter/transporter.js
125
- - js/comm/urlresponder/js.inc
126
117
  - js/comm/urlresponder/urlresponder.js
127
- - js/comm/values/js.inc
128
118
  - js/comm/values/values.js
129
119
  - js/controls/button/button.js
130
- - js/controls/button/js.inc
131
120
  - js/controls/button/themes/bright/button.css
132
121
  - js/controls/button/themes/bright/button.html
133
122
  - js/controls/button/themes/bright/button_parts1-ie6.gif
@@ -137,16 +126,12 @@ files:
137
126
  - js/controls/button/themes/default/button_parts1-ie6.gif
138
127
  - js/controls/button/themes/default/button_parts1.png
139
128
  - js/controls/checkbox/checkbox.js
140
- - js/controls/checkbox/js.inc
141
129
  - js/controls/checkbox/themes/default/checkbox.css
142
130
  - js/controls/checkbox/themes/default/checkbox.html
143
131
  - js/controls/checkbox/themes/default/checkbox_parts1-ie6.gif
144
132
  - js/controls/checkbox/themes/default/checkbox_parts1.png
145
133
  - js/controls/dialogs/alert_sheet/alert_sheet.js
146
- - js/controls/dialogs/alert_sheet/js.inc
147
134
  - js/controls/dialogs/confirm_sheet/confirm_sheet.js
148
- - js/controls/dialogs/confirm_sheet/js.inc
149
- - js/controls/dialogs/sheet/js.inc
150
135
  - js/controls/dialogs/sheet/sheet.js
151
136
  - js/controls/dialogs/sheet/themes/default/sheet.css
152
137
  - js/controls/dialogs/sheet/themes/default/sheet.html
@@ -161,25 +146,19 @@ files:
161
146
  - js/controls/dialogs/sheet/themes/default/sheet_warning-ie6.gif
162
147
  - js/controls/dialogs/sheet/themes/default/sheet_warning.png
163
148
  - js/controls/imageview/imageview.js
164
- - js/controls/imageview/js.inc
165
149
  - js/controls/imageview/themes/default/blank.gif
166
- - js/controls/passwordcontrol/js.inc
167
150
  - js/controls/passwordcontrol/passwordcontrol.js
168
151
  - js/controls/passwordcontrol/themes/default/passwordcontrol.css
169
152
  - js/controls/passwordcontrol/themes/default/passwordcontrol.html
170
- - js/controls/progress/progressbar/js.inc
171
153
  - js/controls/progress/progressbar/progressbar.js
172
154
  - js/controls/progress/progressbar/themes/default/progressbar.css
173
155
  - js/controls/progress/progressbar/themes/default/progressbar.html
174
- - js/controls/progress/progressindicator/js.inc
175
156
  - js/controls/progress/progressindicator/progressindicator.js
176
- - js/controls/radiobutton/js.inc
177
157
  - js/controls/radiobutton/radiobutton.js
178
158
  - js/controls/radiobutton/themes/default/radiobutton.css
179
159
  - js/controls/radiobutton/themes/default/radiobutton.html
180
160
  - js/controls/radiobutton/themes/default/radiobutton_parts1-ie6.gif
181
161
  - js/controls/radiobutton/themes/default/radiobutton_parts1.png
182
- - js/controls/sliders/slider/js.inc
183
162
  - js/controls/sliders/slider/slider.js
184
163
  - js/controls/sliders/slider/themes/default/hslider_tracks-ie6.gif
185
164
  - js/controls/sliders/slider/themes/default/hslider_tracks.png
@@ -187,23 +166,19 @@ files:
187
166
  - js/controls/sliders/slider/themes/default/slider.html
188
167
  - js/controls/sliders/slider/themes/default/slider_thumbs-ie6.gif
189
168
  - js/controls/sliders/slider/themes/default/slider_thumbs.png
190
- - js/controls/sliders/vslider/js.inc
191
169
  - js/controls/sliders/vslider/themes/default/vslider.css
192
170
  - js/controls/sliders/vslider/themes/default/vslider.html
193
171
  - js/controls/sliders/vslider/themes/default/vslider_tracks-ie6.gif
194
172
  - js/controls/sliders/vslider/themes/default/vslider_tracks.png
195
173
  - js/controls/sliders/vslider/vslider.js
196
- - js/controls/stepper/js.inc
197
174
  - js/controls/stepper/stepper.js
198
175
  - js/controls/stepper/themes/default/stepper-ie6.gif
199
176
  - js/controls/stepper/themes/default/stepper.css
200
177
  - js/controls/stepper/themes/default/stepper.html
201
178
  - js/controls/stepper/themes/default/stepper.png
202
- - js/controls/stringview/js.inc
203
179
  - js/controls/stringview/stringview.js
204
180
  - js/controls/stringview/themes/default/stringview.css
205
181
  - js/controls/stringview/themes/default/stringview.html
206
- - js/controls/tab/js.inc
207
182
  - js/controls/tab/tab.js
208
183
  - js/controls/tab/themes/bright/tab.css
209
184
  - js/controls/tab/themes/bright/tab.html
@@ -221,11 +196,9 @@ files:
221
196
  - js/controls/tab/themes/default/tab_border_pattern.png
222
197
  - js/controls/tab/themes/default/tab_parts1-ie6.gif
223
198
  - js/controls/tab/themes/default/tab_parts1.png
224
- - js/controls/textarea/js.inc
225
199
  - js/controls/textarea/textarea.js
226
200
  - js/controls/textarea/themes/default/textarea.css
227
201
  - js/controls/textarea/themes/default/textarea.html
228
- - js/controls/textcontrol/js.inc
229
202
  - js/controls/textcontrol/textcontrol.js
230
203
  - js/controls/textcontrol/themes/default/textcontrol.css
231
204
  - js/controls/textcontrol/themes/default/textcontrol.html
@@ -235,18 +208,15 @@ files:
235
208
  - js/controls/textcontrol/themes/default/textcontrol_parts2.png
236
209
  - js/controls/textcontrol/themes/default/textcontrol_parts3-ie6.gif
237
210
  - js/controls/textcontrol/themes/default/textcontrol_parts3.png
238
- - js/controls/uploader/js.inc
239
211
  - js/controls/uploader/themes/default/upload_progress.gif
240
212
  - js/controls/uploader/themes/default/uploader.css
241
213
  - js/controls/uploader/themes/default/uploader.html
242
214
  - js/controls/uploader/uploader.js
243
- - js/controls/validatorview/js.inc
244
215
  - js/controls/validatorview/themes/default/validator-ie6.gif
245
216
  - js/controls/validatorview/themes/default/validator.png
246
217
  - js/controls/validatorview/themes/default/validatorview.css
247
218
  - js/controls/validatorview/themes/default/validatorview.html
248
219
  - js/controls/validatorview/validatorview.js
249
- - js/controls/window/js.inc
250
220
  - js/controls/window/themes/default/window.css
251
221
  - js/controls/window/themes/default/window.html
252
222
  - js/controls/window/themes/default/window_bg_active-ie6.gif
@@ -261,35 +231,25 @@ files:
261
231
  - js/controls/window/themes/default/window_parts2.png
262
232
  - js/controls/window/window.js
263
233
  - js/core/class/class.js
264
- - js/core/class/js.inc
265
234
  - js/core/elem/elem.js
266
- - js/core/elem/js.inc
267
235
  - js/core/event/event.js
268
- - js/core/event/js.inc
269
236
  - js/core/iefix/ie_css_element.htc
270
237
  - js/core/iefix/ie_css_style.htc
271
238
  - js/core/iefix/iefix.js
272
- - js/core/iefix/js.inc
273
- - js/core/rsence_ns/js.inc
274
239
  - js/core/rsence_ns/rsence_ns.js
275
240
  - js/datetime/calendar/calendar.js
276
- - js/datetime/calendar/js.inc
277
241
  - js/datetime/calendar/themes/default/calendar.css
278
242
  - js/datetime/calendar/themes/default/calendar.html
279
243
  - js/datetime/calendar/themes/default/calendar_arrows-ie6.gif
280
244
  - js/datetime/calendar/themes/default/calendar_arrows.png
281
245
  - js/datetime/datetimepicker/datetimepicker.js
282
- - js/datetime/datetimepicker/js.inc
283
246
  - js/datetime/datetimevalue/datetimevalue.js
284
- - js/datetime/datetimevalue/js.inc
285
- - js/datetime/timesheet/js.inc
286
247
  - js/datetime/timesheet/old_timesheet.js
287
248
  - js/datetime/timesheet/themes/default/old_timesheet.css
288
249
  - js/datetime/timesheet/themes/default/old_timesheet.html
289
250
  - js/datetime/timesheet/themes/default/timesheet.css
290
251
  - js/datetime/timesheet/themes/default/timesheet.html
291
252
  - js/datetime/timesheet/timesheet.js
292
- - js/datetime/timesheet_item/js.inc
293
253
  - js/datetime/timesheet_item/old_timesheet_item.js
294
254
  - js/datetime/timesheet_item/themes/default/old_timesheet_item.css
295
255
  - js/datetime/timesheet_item/themes/default/old_timesheet_item.html
@@ -297,68 +257,38 @@ files:
297
257
  - js/datetime/timesheet_item/themes/default/timesheet_item.html
298
258
  - js/datetime/timesheet_item/themes/default/timesheet_item_icons.png
299
259
  - js/datetime/timesheet_item/timesheet_item.js
300
- - js/datetime/timesheet_item_edit/js.inc
301
260
  - js/datetime/timesheet_item_edit/old_timesheet_item_edit.js
302
261
  - js/datetime/timesheet_item_edit/timesheet_item_edit.js
303
262
  - js/foundation/application/application.js
304
- - js/foundation/application/js.inc
305
263
  - js/foundation/control/control.js
306
264
  - js/foundation/control/controldefaults/controldefaults.js
307
- - js/foundation/control/controldefaults/js.inc
308
265
  - js/foundation/control/dummyvalue/dummyvalue.js
309
- - js/foundation/control/dummyvalue/js.inc
310
266
  - js/foundation/control/dyncontrol/dyncontrol.js
311
- - js/foundation/control/dyncontrol/js.inc
312
267
  - js/foundation/control/dyncontrol/themes/default/dyncontrol.css
313
268
  - js/foundation/control/dyncontrol/themes/default/dyncontrol.html
314
269
  - js/foundation/control/eventresponder/eventresponder.js
315
- - js/foundation/control/eventresponder/js.inc
316
- - js/foundation/control/js.inc
317
- - js/foundation/control/valueaction/js.inc
318
270
  - js/foundation/control/valueaction/valueaction.js
319
- - js/foundation/control/valuematrix/js.inc
320
271
  - js/foundation/control/valuematrix/valuematrix.js
321
- - js/foundation/control/valueresponder/js.inc
322
272
  - js/foundation/control/valueresponder/valueresponder.js
323
273
  - js/foundation/eventmanager/eventmanager.js
324
- - js/foundation/eventmanager/js.inc
325
- - js/foundation/geom/point/js.inc
326
274
  - js/foundation/geom/point/point.js
327
- - js/foundation/geom/rect/js.inc
328
275
  - js/foundation/geom/rect/rect.js
329
- - js/foundation/json_renderer/js.inc
330
276
  - js/foundation/json_renderer/json_renderer.js
331
- - js/foundation/locale_settings/js.inc
332
277
  - js/foundation/locale_settings/locale_settings.js
333
- - js/foundation/system/js.inc
334
278
  - js/foundation/system/system.js
335
- - js/foundation/thememanager/js.inc
336
279
  - js/foundation/thememanager/thememanager.js
337
- - js/foundation/value/js.inc
338
280
  - js/foundation/value/value.js
339
- - js/foundation/view/js.inc
340
- - js/foundation/view/markupview/js.inc
341
281
  - js/foundation/view/markupview/markupview.js
342
- - js/foundation/view/morphanimation/js.inc
343
282
  - js/foundation/view/morphanimation/morphanimation.js
344
283
  - js/foundation/view/view.js
345
- - js/foundation/view/viewdefaults/js.inc
346
284
  - js/foundation/view/viewdefaults/viewdefaults.js
347
- - js/graphics/svgcontrol/js.inc
348
285
  - js/graphics/svgcontrol/svgcontrol.js
349
286
  - js/lists/checkboxlist/checkboxlist.js
350
- - js/lists/checkboxlist/js.inc
351
- - js/lists/listitems/js.inc
352
287
  - js/lists/listitems/listitems.js
353
- - js/lists/propertylist/js.inc
354
288
  - js/lists/propertylist/propertylist.js
355
- - js/lists/propertylist/propertylisteditor/js.inc
356
289
  - js/lists/propertylist/propertylisteditor/propertylisteditor.js
357
- - js/lists/radiobuttonlist/js.inc
358
290
  - js/lists/radiobuttonlist/radiobuttonlist.js
359
- - js/menus/minimenu/js.inc
360
291
  - js/menus/minimenu/minimenu.js
361
- - js/menus/minimenu/minimenuitem/js.inc
362
292
  - js/menus/minimenu/minimenuitem/minimenuitem.js
363
293
  - js/menus/minimenu/minimenuitem/themes/default/minimenuitem.css
364
294
  - js/menus/minimenu/minimenuitem/themes/default/minimenuitem.html
@@ -366,17 +296,12 @@ files:
366
296
  - js/menus/minimenu/themes/default/minimenu.css
367
297
  - js/menus/minimenu/themes/default/minimenu.html
368
298
  - js/menus/minimenu/themes/default/minimenu.png
369
- - js/util/reloadapp/js.inc
370
299
  - js/util/reloadapp/reloadapp.js
371
300
  - js/util/reloadapp/themes/default/reloadapp_warning-ie6.gif
372
301
  - js/util/reloadapp/themes/default/reloadapp_warning.png
373
- - js/util/sha/js.inc
374
302
  - js/util/sha/sha.js
375
303
  - js/views/centerview/centerview.js
376
- - js/views/centerview/js.inc
377
304
  - js/views/inlineview/inlineview.js
378
- - js/views/inlineview/js.inc
379
- - js/views/scrollview/js.inc
380
305
  - js/views/scrollview/scrollview.js
381
306
  - README.rdoc
382
307
  - INSTALL.rdoc
@@ -389,7 +314,6 @@ files:
389
314
  - VERSION
390
315
  - .yardopts
391
316
  - bin/rsence-pre
392
- has_rdoc: yard
393
317
  homepage: http://www.rsence.org/
394
318
  licenses: []
395
319
 
@@ -423,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
423
347
  requirements: []
424
348
 
425
349
  rubyforge_project: rsence-
426
- rubygems_version: 1.6.2
350
+ rubygems_version: 1.8.3
427
351
  signing_key:
428
352
  specification_version: 3
429
353
  summary: Pre-Release 2.2 version of the RSence framework.
File without changes
data/js/comm/js.inc DELETED
File without changes
File without changes
data/js/comm/queue/js.inc DELETED
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
data/js/core/class/js.inc DELETED
File without changes
data/js/core/elem/js.inc DELETED
File without changes
data/js/core/event/js.inc DELETED
File without changes
data/js/core/iefix/js.inc DELETED
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
data/js/util/sha/js.inc DELETED
File without changes
File without changes
File without changes
File without changes