netzke-basepack 0.7.7 → 0.8.0

data/lib/netzke/basepack/search_panel.rb

@@ -6,47 +6,45 @@ module Netzke
 
       include Netzke::Basepack::DataAccessor
 
-      js_base_class "Ext.form.FormPanel"
-
-      js_properties(
-        :padding => 5,
-        :auto_scroll => true
-      )
-
-      js_include :condition_field
-
-      js_mixin :search_panel
-
-      js_property :attribute_operators_map, {
+      ATTRIBUTE_OPERATORS_MAP = {
         :integer => [
           ["eq", I18n.t('netzke.basepack.search_panel.equals')],
           ["gt", I18n.t('netzke.basepack.search_panel.greater_than')],
           ["lt", I18n.t('netzke.basepack.search_panel.less_than')]
         ],
-        :text => [
-          ["contains", I18n.t('netzke.basepack.search_panel.contains')] # same as matches => %string%
+          :text => [
+            ["contains", I18n.t('netzke.basepack.search_panel.contains')] # same as matches => %string%
         ],
         :string => [
           ["contains", I18n.t('netzke.basepack.search_panel.contains')], # same as matches => %string%
           ["matches", I18n.t('netzke.basepack.search_panel.matches')]
         ],
-        :boolean => [
-          ["is_any", I18n.t('netzke.basepack.search_panel.is_true')],
-          ["is_true", I18n.t('netzke.basepack.search_panel.is_true')],
-          ["is_false", I18n.t('netzke.basepack.search_panel.is_false')]
+          :boolean => [
+            ["is_any", I18n.t('netzke.basepack.search_panel.is_true')],
+            ["is_true", I18n.t('netzke.basepack.search_panel.is_true')],
+            ["is_false", I18n.t('netzke.basepack.search_panel.is_false')]
         ],
-        :datetime => [
-          ["eq", I18n.t('netzke.basepack.search_panel.date_equals')],
-          ["gt", I18n.t('netzke.basepack.search_panel.after')],
-          ["lt", I18n.t('netzke.basepack.search_panel.before')]
+          :datetime => [
+            ["eq", I18n.t('netzke.basepack.search_panel.date_equals')],
+            ["gt", I18n.t('netzke.basepack.search_panel.after')],
+            ["lt", I18n.t('netzke.basepack.search_panel.before')]
         ]
       }
 
+      js_configure do |c|
+        c.extend = "Ext.form.FormPanel"
+        c.padding = 5
+        c.auto_scroll = true
+        c.require :condition_field
+        c.mixin
+        c.attribute_operators_map = ATTRIBUTE_OPERATORS_MAP
+      end
+
       # Builds default query search panel, where each field is presented
       def default_query
         data_class.column_names.map do |c|
           column_type = data_class.columns_hash[c].type
-          operator = (self.class.js_property(:attribute_operators_map)[column_type] || []).first.try(:fetch, 0) || "matches"
+          operator = (ATTRIBUTE_OPERATORS_MAP[column_type] || []).first.try(:fetch, 0) || "matches"
           {:attr => c, :attr_type => column_type, :operator => operator}
         end
       end
@@ -58,7 +56,7 @@ module Netzke
       def js_config
         super.merge(
           :attrs => attributes,
-          :attrs_hash => data_class.column_names.inject({}){ |hsh,c| 
+          :attrs_hash => data_class.column_names.inject({}){ |hsh,c|
             hsh.merge(c => data_adapter.get_property_type(data_class.columns_hash[c])) },
           :preset_query => (config[:load_last_preset] ? last_preset.try(:fetch, "query") : config[:query]) || []
         )

data/lib/netzke/basepack/search_panel/javascripts/condition_field.js

@@ -1,4 +1,4 @@
-Ext.define('Netzke.classes.Basepack.SearchPanel.ConditionField', {
+Ext.define('Netzke.classes.Netzke.Basepack.SearchPanel.ConditionField', {
   extend:     'Ext.form.FieldContainer',
   alias:      'widget.netzkebasepacksearchpanelconditionfield',
 
@@ -101,7 +101,7 @@ Ext.define('Netzke.classes.Basepack.SearchPanel.ConditionField', {
 
     this.items = items;
 
-    // Why on Earth is this not working? Netzke.classes.Basepack.SearchPanel.ConditionField undefined???
+    // Why on Earth is this not working? Netzke.classes.Netzke.Basepack.SearchPanel.ConditionField undefined???
     // Netzke.classes.Basepack.SearchPanel.ConditionField.superclass.initComponent.call(this);
     // Ext.form.CompositeField.prototype.initComponent.call(this); // workaround
     this.callParent();

data/lib/netzke/basepack/search_window.rb

@@ -2,65 +2,59 @@ module Netzke
   module Basepack
     class SearchWindow < Netzke::Basepack::Window
 
-      action :search do
-        { :text => I18n.t('netzke.basepack.search_window.action.search') }
+      action :search
+      action :cancel
+
+      js_configure do |c|
+        c.width = "50%"
+        c.auto_height = true
+        c.close_action = "hide"
+        c.modal = true
+        c.init_component = <<-JS
+          function(){
+            this.callParent();
+
+            this.on('show', function(){
+              this.closeRes = 'cancel';
+            });
+          }
+        JS
+
+        c.get_query = <<-JS
+          function(){
+            return this.items.first().getQuery();
+          }
+        JS
+
+        c.on_search = <<-JS
+          function(){
+            this.closeRes = 'search';
+            this.hide();
+          }
+        JS
+
+        c.on_cancel = <<-JS
+          function(){
+            this.hide();
+          }
+        JS
       end
 
-      action :cancel do
-        { :text => I18n.t('netzke.basepack.search_window.action.cancel') }
+      def configure(c)
+        super
+        c.items = [:search_panel]
+        c.title = I18n.t('netzke.basepack.search_window.title')
+        c.persistence = false
+        c.prevent_header = true
+        c.buttons = [:search, :cancel]
       end
 
-      js_properties :width => "50%",
-                    :auto_height => true,
-                    :close_action => "hide",
-                    :buttons => [:search.action, :cancel.action],
-                    :modal => true
-
-      def configuration
-        super.tap do |s|
-          s[:items] = [:search_panel.component(:prevent_header => true)]
-          s[:title] = I18n.t('netzke.basepack.search_window.title')
-          s[:persistence] = false
-        end
-      end
-
-      component :search_panel do
-        {
-          :class_name => "Netzke::Basepack::QueryBuilder",
-          :model => config[:model],
-          :fields => config[:fields]
-        }
+      component :search_panel do |c|
+        c.klass = QueryBuilder
+        c.model = config[:model]
+        c.fields = config[:fields]
       end
 
-      js_method :init_component, <<-JS
-        function(){
-          this.callParent();
-
-          this.on('show', function(){
-            this.closeRes = 'cancel';
-          });
-        }
-      JS
-
-      js_method :get_query, <<-JS
-        function(){
-          return this.items.first().getQuery();
-        }
-      JS
-
-      js_method :on_search, <<-JS
-        function(){
-          this.closeRes = 'search';
-          this.hide();
-        }
-      JS
-
-      js_method :on_cancel, <<-JS
-        function(){
-          this.hide();
-        }
-      JS
-
     end
   end
 end

data/lib/netzke/basepack/simple_app.rb

@@ -31,26 +31,23 @@ module Netzke
     #
     # The JS side of the component will have those regions referenced as this.mainPanel, this.statusBar, and this.menuBar.
     class SimpleApp < Base
+      js_configure do |c|
+        c.extend = "Ext.container.Viewport"
+        c.layout = :border
+        c.require Netzke::Core.ext_path.join("examples", "ux/statusbar/StatusBar.js"), :statusbar_ext
+        c.mixin
+      end
 
-      js_base_class "Ext.container.Viewport"
-
-      js_property :layout, :border
-      #js_include "#{File.dirname(__FILE__)}/../../../../../../public/extjs/examples/ux/statusbar/StatusBar.js"
-      js_include Netzke::Core.ext_path.join("examples", "ux/statusbar/StatusBar.js"), :statusbar_ext
-
-      js_mixin :simple_app
+      def configure(c)
+        super
+        c.items = [main_panel_config, menu_bar_config, status_bar_config]
+      end
 
       # In Ext 4.1 calling `render` on a viewport causes an error
       def js_component_render
         ""
       end
 
-      def configuration
-        super.merge(
-          :items => [main_panel_config, menu_bar_config, status_bar_config]
-        )
-      end
-
       # Override for custom menu
       def menu
         []

data/lib/netzke/basepack/simple_app/javascripts/simple_app.js

@@ -33,7 +33,7 @@
   processHistory: function(token){
     if (token){
       this.mainPanel.removeAll();
-      this.loadNetzkeComponent({name: token, container: this.mainPanel});
+      this.netzkeLoadComponent(token, {container: this.mainPanel});
     } else {
       this.mainPanel.removeAll();
     }
@@ -47,17 +47,11 @@
     Ext.util.History.add(name);
   },
 
-  loadNetzkeComponentByAction: function(action){
+  netzkeLoadComponentByAction: function(action){
     var componentName = action.component || action.name;
     if (componentName) this.appLoadComponent(componentName);
   },
 
-  // DEPRECATED
-  loadComponentByAction: function(action) {
-    Netzke.deprecationWarning("loadComponentByAction is deprecated in favor of loadNetzkeComponentByAction");
-    this.loadNetzkeComponentByAction(action);
-  },
-
   onToggleConfigMode: function(params){
     this.toggleConfigMode();
   }

data/lib/netzke/basepack/tab_panel.rb

@@ -5,7 +5,7 @@ module Netzke
     # Features:
     # * Dynamically loads components for the tabs that get activated for the first time
     # * (TODO) Provides the method markTabsOutdated to mark all inactive tabs as 'outdated', and calls "update" method on components in tabs when they get activated
-    # * (TODO) Stores the last active tab in persistent_config
+    # * (TODO) Stores the last active tab in persistent config
     #
     # ToDo:
     # * Introduce a second or two delay before informing the server about a tab switched
@@ -13,9 +13,10 @@ module Netzke
 
       include WrapLazyLoaded
 
-      js_base_class "Ext.TabPanel"
-
-      js_mixin :tab_panel
+      js_configure do |c|
+        c.extend = "Ext.tab.Panel"
+        c.mixin
+      end
     end
   end
 end

data/lib/netzke/basepack/tab_panel/javascripts/tab_panel.js

@@ -1,10 +1,10 @@
 {
   initComponent: function(params){
-    Netzke.classes.Basepack.TabPanel.superclass.initComponent.call(this);
-    this.on('tabchange', function(self, i){
-      if (i && i.wrappedComponent && !i.items.first() && !i.beingLoaded) {
-        i.beingLoaded = true; // prevent more than one request per tab in case of fast clicking
-        this.loadNetzkeComponent({name: i.wrappedComponent, container: i.id}, function(){i.beingLoaded = false});
+    this.callParent();
+    this.on('tabchange', function(self, tab){
+      if (tab && tab.wrappedComponent && !tab.items.first() && !tab.beingLoaded) {
+        tab.beingLoaded = true; // prevent more than one request per tab in case of fast clicking
+        this.netzkeLoadComponent(tab.wrappedComponent, {container: tab.id, callback: function(){tab.beingLoaded = false}});
       }
     }, this);
   }

data/lib/netzke/basepack/version.rb

@@ -2,8 +2,8 @@ module Netzke
   module Basepack
     module Version
       MAJOR = 0
-      MINOR = 7
-      PATCH = 7
+      MINOR = 8
+      PATCH = 0
 
       STRING = [MAJOR, MINOR, PATCH].compact.join('.')
     end

data/lib/netzke/basepack/viewport.rb

@@ -0,0 +1,16 @@
+module Netzke
+  module Basepack
+    class Viewport < Netzke::Base
+      js_configure do |c|
+        c.extend = "Ext.container.Viewport"
+      end
+
+      # In Ext 4.1 calling `render` on a viewport causes an error:
+      #
+      #   TypeError: protoEl is null
+      def js_component_render
+        ""
+      end
+    end
+  end
+end

data/lib/netzke/basepack/window.rb

@@ -1,29 +1,38 @@
 module Netzke
   module Basepack
-    # == Window
-    # Ext.Window-based component able to nest other Netzke components
+    # Ext.window.Window-based component. With +persistence+ option set to +true+, it will remember it's size, position, and maximized state.
     #
-    # == Features
-    # * Persistent position and dimensions
+    # Example:
     #
-    # == Instance configuration
-    # <tt>:item</tt> - nested Netzke component, e.g.:
+    #     class MyWindow < Netke::Basepack::Window
+    #       def configure
+    #         super
+    #         c.width = 800
+    #         c.height = 600
+    #         c.items = [:users] # nesting the `users` component declared below
+    #       end
     #
-    #     netzke :window, :item => {:class_name => "GridPanel", :model => "User"}
+    #       component :users
+    #     end
     class Window < Netzke::Base
-      js_base_class "Ext.window.Window"
+      js_configure do |c|
+        c.extend = "Ext.window.Window"
+        c.mixin
+      end
+
+      def js_configure(c)
+        super
+        [:x, :y, :width, :height].each { |p| c[p] = state[p].to_i if state[p] }
+        c.maximized = state[:maximized] if state[:maximized]
+      end
 
-      js_mixin
+      endpoint :set_size_and_position do |params, this|
+        [:x, :y, :width, :height].each {|p| state[p] = params[p].to_i}
+      end
 
-      endpoint :set_size_and_position do |params|
-        update_persistent_options(
-          :x => params[:x].to_i,
-          :y => params[:y].to_i,
-          :width => params[:w].to_i,
-          :height => params[:h].to_i
-        )
-        {}
+      endpoint :set_maximized do |maximized,this|
+        maximized ? state[:maximized] = true : state.delete(:maximized)
       end
     end
   end
-end
+end

data/lib/netzke/basepack/window/javascripts/window.js

@@ -9,12 +9,18 @@
       this.on("show", function(){
         this.on("move", this.onMoveResize, this);
         this.on("resize", this.onMoveResize, this);
+        this.on("maximize", Ext.Function.pass(this.onMaximize, [true]), this);
+        this.on("restore", Ext.Function.pass(this.onMaximize, [false]), this);
       }, this);
     }
   },
 
   onMoveResize: function(){
     var x = this.getPosition()[0], y = this.getPosition()[1], w = this.getSize().width, h = this.getSize().height;
-    this.setSizeAndPosition({x:x, y:y, w:w, h:h}); // API call
+    this.setSizeAndPosition({x: x, y: y, width: w, height: h}); // API call
+  },
+
+  onMaximize: function(maximized) {
+    this.setMaximized(maximized);
   }
 }

data/lib/netzke/basepack/wrap_lazy_loaded.rb

@@ -2,27 +2,27 @@ module Netzke
   module Basepack
     # Include this module into your component component class when you want lazy-loaded component in config to be auto-replaced with
     # a panel with the 'fit' layout, and a property wrappedComponent set to the name of the original component.
-    # Used, for instance, in TabPanel and AccordionPanel to dynamically load components on expanding a panel or clicking
+    # Used, for instance, in TabPanel and Accordion to dynamically load components on expanding a panel or clicking
     # a tab.
     module WrapLazyLoaded
-      def items
-        orig = super.dup
-        orig.each do |item|
-          wrapped_component = components[item[:netzke_component]]
-          # When a nested component with lazy loading is detected, it gets replaced with a 'fit' panel,
-          # into which later the component itself is dynamically loaded on request.
-          if wrapped_component && wrapped_component[:lazy_loading]
-            item.replace({
-              :layout => 'fit',
-              :wrapped_component => wrapped_component[:name],
-              :title => wrapped_component[:title] || wrapped_component[:name],
-              :icon_cls => wrapped_component[:icon_cls],
-              :disabled => wrapped_component[:disabled]
-            })
-          end
+      def extend_item(item)
+        item = super
+
+        c = components[item[:netzke_component]].try(:merge, item)
+
+        # when a nested component with lazy loading is detected, it gets replaced with a 'fit' panel,
+        # into which later the component itself is dynamically loaded on request.
+        if c && !c[:eager_loading]
+          { layout: :fit,
+            wrapped_component: c[:item_id],
+            title: c[:title] || c[:item_id].humanize,
+            icon_cls: c[:icon_cls],
+            disabled: c[:disabled]
+          }
+        else
+          item
         end
-        orig
       end
     end
   end
-end
+end