netzke-basepack 0.12.3 → 0.12.4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.12.4 - WIP
+* Remove (broken) `load_inline_data` option
+
 # 0.12.3 - 2015-06-16
 * Fix bug preventing primary key column from being overridden in a specific case
 * Fix grid freeze when `prohibit_read` is set to true

data/Gemfile

@@ -22,6 +22,6 @@ group :development, :test do
   gem 'web-console', '~> 2.0'
   # gem 'spring' # troubles...
   gem 'pry-rails'
-  gem 'netzke-core', github: 'netzke/netzke-core'
-  gem 'netzke-testing', github: 'netzke/netzke-testing'
+  gem 'netzke-core', github: 'netzke/netzke-core', branch: 'master'
+  gem 'netzke-testing', github: 'netzke/netzke-testing', branch: 'master'
 end

data/lib/netzke/basepack/form.rb

@@ -28,8 +28,8 @@ module Netzke
     class Form < Netzke::Base
       include self::Endpoints
       include self::Services
-      include Fields
-      include DataAccessor
+      include Netzke::Basepack::Fields
+      include Netzke::Basepack::DataAccessor
       include Netzke::Core::ConfigToDslDelegator
 
       js_configure do |c|

data/lib/netzke/basepack/grid.rb

@@ -73,11 +73,6 @@ module Netzke
     #
     #   (defaults to 30) number of rows per page (ignored when +enable_pagination+ is set to +false+)
     #
-    # [load_inline_data]
-    #
-    #   (defaults to false) grid is being loaded along with its initial data; use with precaution, preferred method is
-    #   auto-loading of data in a separate server request (see +data_store+)
-    #
     # [data_store]
     #
     #   (defaults to empty Hash) extra configuration for the JS class's internal store (see
@@ -342,8 +337,8 @@ module Netzke
     class Grid < Netzke::Base
       include self::Endpoints
       include self::Services
-      include Columns
-      include DataAccessor
+      include Netzke::Basepack::Columns
+      include Netzke::Basepack::DataAccessor
       include Netzke::Core::ConfigToDslDelegator
 
       class_attribute :column_filters_available
@@ -398,7 +393,6 @@ module Netzke
         c.context_menu = context_menu
         c.columns = {items: js_columns}
         c.columns_order = columns_order
-        c.inline_data = read if c.load_inline_data
         c.pri = data_adapter.primary_key
         if c.default_filters
           populate_cols_with_filters(c)

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

@@ -41,9 +41,6 @@
     // data store
     this.store = this.netzkeBuildStore();
 
-    // load inline data if available
-    if (this.inlineData) this.store.loadRawData(this.inlineData);
-
     // Cell editing
     if (!this.prohibitUpdate && this.enableEditInline) {
       this.plugins.push(Ext.create('Ext.grid.plugin.CellEditing', {pluginId: 'celleditor'}));
@@ -154,7 +151,7 @@
       remoteSort: true,
       remoteFilter: true,
       pageSize: this.rowsPerPage,
-      autoLoad: !this.loadInlineData
+      autoLoad: true
     }, this.dataStore));
 
     delete this.dataStore;

data/lib/netzke/basepack/tree.rb

@@ -105,9 +105,8 @@ module Netzke
         c.title = c.title || self.class.js_config.properties[:title] || data_class.name.pluralize
         c.bbar = bbar
         # c.context_menu = context_menu
-        c.columns = js_columns
+        c.columns = {items: js_columns}
         c.columns_order = columns_order
-        c.inline_data = read if c.load_inline_data
         c.pri = data_adapter.primary_key
 
         if c.default_filters

data/lib/netzke/basepack/version.rb

@@ -1,5 +1,5 @@
 module Netzke
   module Basepack
-    VERSION = "0.12.3"
+    VERSION = "0.12.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netzke-basepack
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netzke-core