netzke-basepack 0.5.4 → 0.5.5

data/lib/netzke/grid_panel_extras/record_form_window.rb

@@ -0,0 +1,46 @@
+module Netzke::GridPanelExtras
+  class RecordFormWindow < Window
+    def actions
+      {:ok => {:text => "OK"}, :cancel => {:text => "Cancel"}}
+    end
+    
+    def initial_config
+      super.deep_merge({
+        :ext_config => {
+          :modal => true,
+          :width => "60%",
+          :height => "90%",
+          :fbar => [:ok, :cancel]
+        }
+      })
+    end
+    
+    def self.js_extend_properties
+      {
+        :button_align => "right",
+        
+        :init_component => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            #{js_full_class_name}.superclass.initComponent.call(this);
+            this.getWidget().on("submitsuccess", function(){this.closeRes = "ok"; this.close();}, this);
+          }
+        END_OF_JAVASCRIPT
+        
+        :on_ok => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            this.getWidget().onApply();
+            // this.closeRes = "ok",
+            // this.close();
+          }
+        END_OF_JAVASCRIPT
+        
+        :on_cancel => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            this.close();
+          }
+        END_OF_JAVASCRIPT
+        
+      }
+    end
+  end
+end

data/lib/netzke/grid_panel_js.rb

@@ -199,7 +199,7 @@ module Netzke
             
             // Now let Ext.grid.EditorGridPanel do the rest
             // Original initComponent
-            Ext.netzke.cache.GridPanel.superclass.initComponent.call(this);
+            #{js_full_class_name}.superclass.initComponent.call(this);
             
             // Inform the server part about column operations
             if (this.persistentConfig) {
@@ -595,7 +595,7 @@ module Netzke
                 },{
                   text:'Cancel',
                   handler:function(){
-                    this.ownerCt.ownerCt.close();
+                    this.ownerCt.ownerCt.hide();
                   }
                 }]
               });
@@ -642,38 +642,15 @@ module Netzke
 
           :on_add_in_form => <<-END_OF_JAVASCRIPT.l,
             function(){
-              if (!this.formWindow) {
-                this.formWindow = new Ext.Window({
-                  title:'Add',
-                  layout: 'fit',
-                  modal: true,
-                  width: 400,
-                  height: Ext.lib.Dom.getViewHeight() *0.9,
-                  closeAction: 'hide',
-                  buttons:[{
-                    text: 'OK',
-                    handler: function(){
-                      this.ownerCt.ownerCt.getWidget().onApply();
-                    }
-                  },{
-                    text:'Cancel',
-                    handler:function(){
-                      this.ownerCt.ownerCt.close();
-                    }
-                  }]
-                });
-              }
-
-              this.formWindow.show(null, function(){
-                this.formWindow.closeRes = 'cancel';
-                if (!this.formWindow.getWidget()){
-                  this.loadAggregatee({id:"newRecordForm", container:this.formWindow.id});
-                }
-              }, this);
-
+              this.loadAggregatee({id: "addForm", callback: function(form){
+                form.on('close', function(){
+                  if (form.closeRes === "ok") {
+                    this.store.reload();
+                  }
+                }, this);
+              }, scope: this});
             }
           END_OF_JAVASCRIPT
-          
         }
         ) if config[:edit_in_form_available]
         

data/lib/netzke/property_editor.rb

@@ -37,7 +37,7 @@ module Netzke
           }
         END_OF_JAVASCRIPT
         
-        :restore_defaults => <<-END_OF_JAVASCRIPT.l,
+        :on_restore_defaults => <<-END_OF_JAVASCRIPT.l,
           function(){
             this.restoreDefaults();
           }

data/lib/netzke/property_editor_extras/helper_model.rb

@@ -78,7 +78,7 @@ module Netzke
 
       # somewhat sofisticated code to convert all NetzkePreferences for current widget into a hash ("un-flatten")
       def attributes
-        prefs = NetzkePreference.find_all_for_widget(self.class.widget.id_name)
+        prefs = NetzkePreference.find_all_for_widget(self.class.widget.global_id)
         res = {}
         prefs.each do |p|
           tmp_res = {}
@@ -93,13 +93,11 @@ module Netzke
       end
 
       def method_missing(method_name, *args)
-        # Rails.logger.debug "!!! method_name: #{method_name.inspect}"
         method_name = method_name.to_s
         method_name_without_equal_sign = method_name.sub(/=$/, '')
-        NetzkePreference.widget_name = self.class.widget.id_name
+        NetzkePreference.widget_name = self.class.widget.global_id
 
         if method_name =~ /=$/
-          # current_value = NetzkePreference[method_name_without_equal_sign] # may be nil
           current_value = self.class.widget.flat_independent_config(method_name_without_equal_sign)
           
           begin
@@ -108,11 +106,9 @@ module Netzke
             new_value = current_value
           end
           
-          # default_value = self.class.widget.flat_default_config(method_name_without_equal_sign)
           initial_value = self.class.widget.flat_initial_config(method_name_without_equal_sign)
       
           new_value = nil if new_value == initial_value
-          # Rails.logger.debug "!!! new_value: #{new_value.inspect}"
           NetzkePreference[method_name_without_equal_sign] = new_value
         else
           res = self.class.widget.flat_independent_config(method_name_without_equal_sign)

data/lib/netzke/tab_panel.rb

@@ -24,7 +24,7 @@ module Netzke
         
         :render => <<-END_OF_JAVASCRIPT.l,
           function(el){
-            Ext.netzke.cache.#{short_widget_class_name}.superclass.render.call(this, el);
+            #{js_full_class_name}.superclass.render.call(this, el);
             
             // We do this all in +render+ because only at this moment the activeTab is actually activated
             var activeTab = this.getActiveTab();
@@ -38,7 +38,8 @@ module Netzke
             var preloadedItemConfig = this[fitPanel.widget.camelize(true)+"Config"];
             if (preloadedItemConfig){
               // preloaded widget only needs to be instantiated, as its class and configuration have already been loaded
-              fitPanel.add(new Ext.netzke.cache[preloadedItemConfig.widgetClassName](preloadedItemConfig));
+              var klass = this.classifyScopedName(preloadedItemConfig.scopedClassName);
+              fitPanel.add(new klass(preloadedItemConfig));
               fitPanel.doLayout();
             } else {
               // load the widget from the server
@@ -103,7 +104,7 @@ module Netzke
     def js_config
       super.merge({
         :items => fit_panels,
-        :active_tab => id_name + '_active' # id of the fit panel that is active
+        :active_tab => global_id + '_active' # id of the fit panel that is active
       })
     end
 
@@ -149,7 +150,7 @@ module Netzke
       res = []
       items.each_with_index do |item, i|
         item_config = {
-          :id => item[:active] && id_name + '_active',
+          :id => item[:active] && global_id + '_active',
           :title => item[:title] || (item[:name] && item[:name].humanize),
           :widget => item[:name] # to know which fit-panel will load which widget
         }

data/lib/netzke/table_editor.rb

@@ -9,7 +9,7 @@ module Netzke
       {
         :init_component => <<-END_OF_JAVASCRIPT.l,
           function(){
-            Ext.netzke.cache.#{short_widget_class_name}.superclass.initComponent.call(this);
+            #{js_full_class_name}.superclass.initComponent.call(this);
 
             var setCentralWidgetEvents = function(){
               this.getCenterWidget().on('addclick', function(){

data/lib/netzke/tree_panel.rb

@@ -13,7 +13,7 @@ class Netzke::TreePanel < Netzke::Base
   
   def js_config
     super.deep_merge({
-      :loader => {:data_url => id_name+"__get_children".l}
+      :loader => {:data_url => global_id+"__get_children".l}
     })
   end
   

data/lib/netzke/window.rb

@@ -0,0 +1,77 @@
+module Netzke
+  # == Window
+  # Ext.Window-based widget
+  # 
+  # == Features
+  # * Persistent position
+  # * Persistent dimensions
+  # 
+  # == Instance configuration
+  # <tt>:height</tt> and <tt>:width</tt> - besides accepting a number (which would be just standard ExtJS),
+  # can accept a string specifying relative sizes, calculated from current browser window dimensions.
+  # E.g.: :height => "90%", :width => "60%"
+  class Window < Base
+    # Based on Ext.Window, naturally
+    def self.js_base_class
+      "Ext.Window"
+    end
+    
+    # Set the passed item as the only aggregatee
+    def initial_aggregatees
+      {:item => config[:item]}
+    end
+    
+    # Extends the JavaScript class
+    def self.js_extend_properties
+      {
+        :layout => "fit",
+        :init_component => <<-END_OF_JAVASCRIPT.l,
+          function(){
+            // Width and height may be specified as percentage of available space, e.g. "60%".
+            // Convert them into actual pixels.
+            Ext.each(["width", "length"], function(k){
+              if (Ext.isString(this[k])) {
+                this[k] = Ext.lib.Dom.getViewHeight() * parseFloat("." + this[k].substr(0, this[k].length - 1)); // "66%" => ".66"
+              }
+            });
+            
+            // Superclass' initComponent
+            #{js_full_class_name}.superclass.initComponent.call(this);
+            
+            // Set the move and resize events after window is shown, so that they don't fire at initial rendering
+            this.on("show", function(){
+              this.on("move", this.onMove, this);
+              this.on("resize", this.onSelfResize, this, {buffer: 50}); // Work around firing "resize" event twice (currently a bug in ExtJS)
+            }, this);
+            this.instantiateChild(this.itemConfig);
+          }
+        END_OF_JAVASCRIPT
+      
+        :on_move => <<-END_OF_JAVASCRIPT.l,
+          function(w,x,y){
+            this.moveToPosition({x:x, y:y});
+          }
+        END_OF_JAVASCRIPT
+
+        :on_self_resize => <<-END_OF_JAVASCRIPT.l,
+          function(w, width, height){
+            this.selfResize({w:width, h:height});
+          }
+        END_OF_JAVASCRIPT
+      }
+    end
+    
+    # Processing API calls from client
+    api :move_to_position
+    def move_to_position(params)
+      update_persistent_ext_config(:x => params[:x].to_i, :y => params[:y].to_i)
+      {}
+    end
+    
+    api :self_resize
+    def self_resize(params)
+      update_persistent_ext_config(:width => params[:w].to_i, :height => params[:h].to_i)
+      {}
+    end
+  end
+end

data/lib/netzke/wrapper.rb

@@ -25,7 +25,7 @@ module Netzke
         
         :init_component => <<-END_OF_JAVASCRIPT.l,
           function(){
-            Ext.netzke.cache.#{short_widget_class_name}.superclass.initComponent.call(this);
+            #{js_full_class_name}.superclass.initComponent.call(this);
 
             // instantiate the item
             this.instantiateChild(this.itemConfig);

data/test/unit/accordion_panel_test.rb

@@ -14,7 +14,7 @@ class AccordionPanelTest < ActiveSupport::TestCase
     assert_equal(2, accordion.initial_aggregatees.keys.size)
     assert_equal("item0", accordion.aggregatees[:item0][:name])
     assert_equal("second_panel", accordion.aggregatees[:second_panel][:name])
-    assert_equal("Panel", accordion.js_config[:second_panel_config][:widget_class_name])
+    assert_equal("Panel", accordion.js_config[:second_panel_config][:scoped_class_name])
   end
 
 end

data/test/unit/grid_panel_test.rb

@@ -15,7 +15,7 @@ require 'netzke/active_record/basepack'
 class GridPanelTest < ActiveSupport::TestCase
   
   test "api" do
-    grid = Netzke::GridPanel.new(:name => 'grid', :data_class_name => 'Book', :layout_manager => false, :columns => [:id, :title, :recent])
+    grid = Netzke::GridPanel.new(:name => 'grid', :data_class_name => 'Book', :columns => [:id, :title, :recent])
 
     # post
     res = grid.post_data("created_records" => [{:title => 'Lord of the Rings'}].to_nifty_json)
@@ -36,7 +36,16 @@ class GridPanelTest < ActiveSupport::TestCase
     assert_equal(nil, Book.first)
     
   end
-
+  
+  test "normalize index" do
+    grid = Netzke::GridPanel.new(:name => 'grid', :data_class_name => 'Book', :columns => [:id, :col0, {:name => :col1, :excluded => true}, :col2, {:name => :col3, :excluded => true}, :col4, :col5])
+    
+    assert_equal(0, grid.normalize_index(0))
+    assert_equal(1, grid.normalize_index(1))
+    assert_equal(3, grid.normalize_index(2))
+    assert_equal(5, grid.normalize_index(3))
+    assert_equal(6, grid.normalize_index(4))
+  end
   
   # TODO: add tests with association column
   

data/test/unit/tab_panel_test.rb

@@ -15,7 +15,7 @@ class TabPanelTest < ActiveSupport::TestCase
     assert_equal("item0", tab_panel.aggregatees[:item0][:name])
     assert_equal("second_panel", tab_panel.aggregatees[:second_panel][:name])
     assert(tab_panel.aggregatees[:second_panel][:active])
-    assert_equal("Panel", tab_panel.js_config[:second_panel_config][:widget_class_name])
+    assert_equal("Panel", tab_panel.js_config[:second_panel_config][:scoped_class_name])
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netzke-basepack
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Sergei Kozlov
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 -05:00
+date: 2009-11-09 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.4
+        version: 0.4.5.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: searchlogic
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: Pre-built Netzke widgets for your RIA
+description: A set of full-featured extendible Netzke widgets (such as FormPanel, GridPanel, Window, BorderLayoutPanel, etc) which can be used as building block for your RIA
 email: sergei@playcode.nl
 executables: []
 
@@ -59,7 +59,6 @@ files:
 - README.rdoc
 - Rakefile
 - TODO.rdoc
-- VERSION
 - autotest/discover.rb
 - init.rb
 - install.rb
@@ -79,12 +78,14 @@ files:
 - lib/netzke/fields_configurator.rb
 - lib/netzke/form_panel.rb
 - lib/netzke/form_panel_api.rb
+- lib/netzke/form_panel_extras/javascripts/netzkefileupload.js
 - lib/netzke/form_panel_extras/javascripts/xcheckbox.js
 - lib/netzke/form_panel_js.rb
 - lib/netzke/grid_panel.rb
 - lib/netzke/grid_panel_api.rb
 - lib/netzke/grid_panel_extras/javascripts/filters.js
 - lib/netzke/grid_panel_extras/javascripts/rows-dd.js
+- lib/netzke/grid_panel_extras/record_form_window.rb
 - lib/netzke/grid_panel_js.rb
 - lib/netzke/masquerade_selector.rb
 - lib/netzke/panel.rb
@@ -95,6 +96,7 @@ files:
 - lib/netzke/tab_panel.rb
 - lib/netzke/table_editor.rb
 - lib/netzke/tree_panel.rb
+- lib/netzke/window.rb
 - lib/netzke/wrapper.rb
 - stylesheets/basepack.css
 - tasks/netzke_basepack_tasks.rake
@@ -169,7 +171,7 @@ rubyforge_project: netzke-basepack
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Pre-built Netzke widgets for your RIA
+summary: Pre-built Rails + ExtJS widgets for your RIA
 test_files: 
 - test/app_root/app/controllers/application.rb
 - test/app_root/app/models/book.rb

data/VERSION

@@ -1 +0,0 @@
-0.5.4