radiant-drag_order-extension 0.4.4 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.6

data/public/javascripts/admin/extensions/drag_order/drag_order.js

@@ -35,7 +35,7 @@ var DragOrderIndex = Class.create({
           method: 'put',
           parameters: {
             'parent_id': this.getPageID(drag.element.up('.page')),
-            'children' : this.buildChildrenString(drag.element)
+            'children' : this.buildChildrenString(drag.element.up('.children').immediateDescendants())
           }
         });
       }.bind(this)
@@ -92,15 +92,16 @@ var DragOrderIndex = Class.create({
     });
   },
   
-  buildChildrenString: function(page) {
+  buildChildrenString: function(pages) {
     var drag_order = this;
     
-    var children = drag_order.getPageID(page);
-    
-    page.siblings('.page').each(function(page) {
-      children += ',' + drag_order.getPageID(page); 
+    var children = '';    
+    pages.each(function(page) {
+      children += drag_order.getPageID(page) + ',';
     })
-    return children
+    children = children.slice(0,-1);
+    
+    return children;
   },
   
   getPageID: function(page) {

data/public/stylesheets/sass/admin/extensions/drag_order/drag_order.sass

@@ -35,7 +35,10 @@
           cursor: move
           left: 9px
           width: 24px
-
+          opacity: 0.25
+          
+          &:hover
+            opacity: 1
           img
             cursor: move
 

data/radiant-drag_order-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-drag_order-extension}
-  s.version = "0.4.4"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2010-11-28}
   s.description = %q{Radiant DragOrder allows you to reorder pages funly}
   s.email = %q{dk@dirkkelly.com}
   s.extra_rdoc_files = [

data/spec/controllers/pages_controller_spec.rb

@@ -41,6 +41,15 @@ describe Admin::PagesController do
         response.should be_success
         response.body.should === 'Pages successfully sorted.'
       end
+      
+      it 'should reorder pages' do
+        put :sort, :parent_id => @params[:parent_id], :children => @params[:children], :format => 'js'
+
+        pages(:one).position.should === 1 # Don't change parent
+        pages(:four).position.should === 0 # Start at zero
+        pages(:three).position.should === 1
+        pages(:two).position.should === 2 # End at 2
+      end
     end
     
   end

data/spec/datasets/sort_pages.rb

@@ -11,21 +11,21 @@ class SortPagesDataset < Dataset::Base
       :title  => 'Two',
       :slug   => 'two',
       :breadcrumb => 'two',
-      :position => 2,
+      :position => 1,
       :parent => pages(:one)
       
     create_record :page, :three,
       :title  => 'Three',
       :slug   => 'three',
       :breadcrumb => 'three',
-      :position => 3,
+      :position => 2,
       :parent => pages(:one)
       
     create_record :page, :four,
       :title  => 'Four',
       :slug   => 'four',
       :breadcrumb => 'four',
-      :position => 4,
+      :position => 3,
       :parent => pages(:one)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-drag_order-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +08:00
+date: 2010-11-28 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency