fuelux-rails 2.2.0 → 2.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f167ba80465946324d406e15219ee60b75a4208
+  data.tar.gz: 3a73a10fb74b5be1ab14dc641536cf7f6022d5ed
+SHA512:
+  metadata.gz: f3eae9530d9c849e7734bbebd6c8fcfcfba5c3c0d44a462cdb4515b88c2d4ed74e2164037acd704821d2b839f3e01eece94af135c83fb0dec9af128f1cb7182f
+  data.tar.gz: 6237cc4523f517e7ba0cde5b4548c4f2ea47a6e2eecf97d05d72fa164ff9828ad5808942a40f91035813bad484f3eda749fd079d027bdb930e6c8168b5248d3b

data/lib/fuelux-rails/version.rb

@@ -1,3 +1,3 @@
 module FueluxRails
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/vendor/assets/javascripts/fuelux/datagrid.js

@@ -18,6 +18,7 @@
 		this.$footerchildren = this.$footer.children().show().css('visibility', 'hidden');
 		this.$topheader = this.$element.find('thead th');
 		this.$searchcontrol = this.$element.find('.search');
+		this.$filtercontrol = this.$element.find('.filter');
 		this.$pagesize = this.$element.find('.grid-pagesize');
 		this.$pageinput = this.$element.find('.grid-pager input');
 		this.$pagedropdown = this.$element.find('.grid-pager .dropdown-menu');
@@ -32,14 +33,27 @@
 		this.$colheader = $('<tr>').appendTo(this.$thead);
 
 		this.options = $.extend(true, {}, $.fn.datagrid.defaults, options);
-		this.options.dataOptions.pageSize = parseInt(this.$pagesize.val(), 10);
+
+		if(this.$pagesize.hasClass('select')) {
+			this.options.dataOptions.pageSize = parseInt(this.$pagesize.select('selectedItem').value, 10);
+		} else {
+			this.options.dataOptions.pageSize = parseInt(this.$pagesize.val(), 10);
+		}
+
 		this.columns = this.options.dataSource.columns();
 
 		this.$nextpagebtn.on('click', $.proxy(this.next, this));
 		this.$prevpagebtn.on('click', $.proxy(this.previous, this));
 		this.$searchcontrol.on('searched cleared', $.proxy(this.searchChanged, this));
+		this.$filtercontrol.on('changed', $.proxy(this.filterChanged, this));
 		this.$colheader.on('click', 'th', $.proxy(this.headerClicked, this));
-		this.$pagesize.on('change', $.proxy(this.pagesizeChanged, this));
+
+		if(this.$pagesize.hasClass('select')) {
+			this.$pagesize.on('changed', $.proxy(this.pagesizeChanged, this));
+		} else {
+			this.$pagesize.on('change', $.proxy(this.pagesizeChanged, this));
+		}
+
 		this.$pageinput.on('change', $.proxy(this.pageChanged, this));
 
 		this.renderColumns();
@@ -167,8 +181,13 @@
 			this.renderData();
 		},
 
-		pagesizeChanged: function (e) {
-			this.options.dataOptions.pageSize = parseInt($(e.target).val(), 10);
+		pagesizeChanged: function (e, pageSize) {
+			if(pageSize) {
+				this.options.dataOptions.pageSize = parseInt(pageSize.value, 10);
+			} else {
+				this.options.dataOptions.pageSize = parseInt($(e.target).val(), 10);
+			}
+
 			this.options.dataOptions.pageIndex = 0;
 			this.renderData();
 		},
@@ -184,6 +203,11 @@
 			this.renderData();
 		},
 
+		filterChanged: function (e, filter) {
+			this.options.dataOptions.filter = filter;
+			this.renderData();
+		},
+
 		previous: function () {
 			this.options.dataOptions.pageIndex--;
 			this.renderData();

data/vendor/assets/javascripts/fuelux/wizard.js

@@ -11,13 +11,18 @@
 	// WIZARD CONSTRUCTOR AND PROTOTYPE
 
 	var Wizard = function (element, options) {
+		var kids;
+
 		this.$element = $(element);
 		this.options = $.extend({}, $.fn.wizard.defaults, options);
 		this.currentStep = 1;
 		this.numSteps = this.$element.find('li').length;
 		this.$prevBtn = this.$element.find('button.btn-prev');
 		this.$nextBtn = this.$element.find('button.btn-next');
-		this.nextText = this.$nextBtn.text();
+
+		kids = this.$nextBtn.children().detach();
+		this.nextText = $.trim(this.$nextBtn.text());
+		this.$nextBtn.append(kids);
 
 		// handle events
 		this.$prevBtn.on('click', $.proxy(this.previous, this));
@@ -44,11 +49,8 @@
 				if (typeof this.lastText !== 'undefined') {
 					// replace text
 					var text = (lastStep !== true) ? this.nextText : this.lastText;
-					this.$nextBtn
-						.contents()
-						.filter(function () {
-							return this.nodeType === 3;
-						}).replaceWith(text);
+					var kids = this.$nextBtn.children().detach();
+					this.$nextBtn.text(text).append(kids);
 				}
 			}
 
@@ -81,6 +83,11 @@
 			var li = $(e.currentTarget);
 
 			var index = $('.steps li').index(li);
+
+			var evt = $.Event('stepclick');
+			this.$element.trigger(evt, {step: index + 1});
+			if (evt.isDefaultPrevented()) return;
+
 			this.currentStep = (index + 1);
 			this.setState();
 		},

data/vendor/toolkit/fuelux.less

@@ -5,6 +5,7 @@
 @import "fuelux/pillbox.less";
 @import "fuelux/radio.less";
 @import "fuelux/spinner.less";
+@import "fuelux/search.less";
 @import "fuelux/select.less";
 @treeBackgroundHover: #DFEEF5;
 @treeBackgroundSelect: #B9DFF1;

data/vendor/toolkit/fuelux/checkbox.less

@@ -49,4 +49,4 @@
 			}
 		}
 	}
-}
+}

data/vendor/toolkit/fuelux/combobox.less

@@ -1,5 +1,11 @@
 .combobox {
+    display: inline-block;
+
 	a {
 		font-size: @baseFontSize;
 	}
+
+    button.btn {
+        border-radius: 0 @inputBorderRadius @inputBorderRadius 0;
+    }
 }

data/vendor/toolkit/fuelux/datagrid.less

@@ -22,6 +22,18 @@
 			float: right;
 		}
 
+		.datagrid-header-right, .datagrid-header-left {
+			.search, .filter {
+				margin-left: 8px;
+				margin-bottom: 0;
+
+				.dropdown-menu {
+					top: auto;
+					left: auto;
+				}
+			}
+		}
+
 		.sorted {
 			.gradientBar(@tableBackgroundAccent, @tableBackgroundAccentDark, @textColor, 'none');
 
@@ -57,6 +69,17 @@
 					width: 60px;
 				}
 
+				.grid-pagesize {
+					display: inline-block;
+					margin-bottom: 5px;
+					vertical-align: middle;
+
+					.dropdown-menu {
+						top: auto;
+						left: auto;
+					}
+				}
+
 				span {
 					font-weight: normal;
 				}
@@ -83,6 +106,8 @@
 					display: inline-block;
 					position: relative;
 					top: -2px;
+					vertical-align: baseline;
+					margin-bottom: 4px;
 				}
 
 				> button {

data/vendor/toolkit/fuelux/radio.less

@@ -49,4 +49,4 @@
 			}
 		}
 	}
-}
+}

data/vendor/toolkit/fuelux/search.less

@@ -0,0 +1,3 @@
+.search {
+    display: inline-block;
+}

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: fuelux-rails
 version: !ruby/object:Gem::Version
-  version: 2.2.0
-  prerelease: 
+  version: 2.3.0
 platform: ruby
 authors:
 - Stephen Baldwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,17 +69,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 description: fuelux-rails project integrates Fuel UX Bootstrap extensions for Rails
@@ -124,6 +113,7 @@ files:
 - vendor/toolkit/fuelux/datagrid.less
 - vendor/toolkit/fuelux/pillbox.less
 - vendor/toolkit/fuelux/radio.less
+- vendor/toolkit/fuelux/search.less
 - vendor/toolkit/fuelux/select.less
 - vendor/toolkit/fuelux/spinner.less
 - vendor/toolkit/fuelux/tree.less
@@ -165,7 +155,8 @@ files:
 - test/test_helper.rb
 homepage: http://www.github.com/stephenbaldwin/fuelux-rails
 licenses: []
-post_install_message: ! "Important: You may need to add a javascript runtime to your
+metadata: {}
+post_install_message: "Important: You may need to add a javascript runtime to your
   Gemfile in order for bootstrap's LESS files to compile to CSS. \n\n**********************************************\n\nExecJS
   supports these runtimes:\n\ntherubyracer - Google V8 embedded within Ruby\n\ntherubyrhino
   - Mozilla Rhino embedded within JRuby\n\nNode.js\n\nApple JavaScriptCore - Included
@@ -174,22 +165,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: fuelux-rails
-rubygems_version: 1.8.24
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Fuel UX for Rails 3.1 Asset Pipeline
 test_files:
 - test/dummy/app/assets/javascripts/application.js