important bug fix in drag-n-drop

victorjonsson · Aug 28, 2014 · c0a4ff4 · c0a4ff4
1 parent f30f0e3
commit c0a4ff4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/arlima.php b/arlima.php
@@ -4,7 +4,7 @@
 Plugin URI: https://github.com/victorjonsson/Arlima
 Description: Manage the order of posts on your front page, or any page you want. This is a plugin suitable for online newspapers that's in need of a fully customizable front page.
 Author: VK (<a href="http://twitter.com/chredd">@chredd</a>, <a href="http://twitter.com/znoid">@znoid</a>, <a href="http://twitter.com/victor_jonsson">@victor_jonsson</a>, <a href="http://twitter.com/lefalque">@lefalque</a>)
-Version: 3.0.beta.45
+Version: 3.0.beta.46
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 */

diff --git a/constants.php b/constants.php
@@ -16,7 +16,7 @@
     or define('ARLIMA_COMPILE_LESS_IN_BROWSER', ARLIMA_DEV_MODE);
 
 // Plugin version (only edit this via grunt!)
-define('ARLIMA_FILE_VERSION', '3.0.beta.45' .(ARLIMA_DEV_MODE ? '__'.time():''));
+define('ARLIMA_FILE_VERSION', '3.0.beta.46' .(ARLIMA_DEV_MODE ? '__'.time():''));
 
 // Which type of tag to use for images in Arlima RSS feeds
 defined('ARLIMA_RSS_IMG_TAG')

diff --git a/js/arlima/arlima.js b/js/arlima/arlima.js
diff --git a/js/arlima/dev/ArlimaNestedSortable.js b/js/arlima/dev/ArlimaNestedSortable.js
@@ -242,11 +242,6 @@ function arlimaNestedSortable(list) {
                     listContainerElem = ui.item.closest('.article-list').get(0),
                     itemIndex = ui.item.prevAll().length;
 
-                if ( ui.item[0].arlimaArticle.isDivider() && _nextIsChild(ui) ) {
-                    $(this).sortable('cancel');
-                    return false;
-                }
-
                 if( ui.item.hasClass('ui-draggable') ) {
                     // this item is taken care of in the recieve event
                     return;
@@ -257,6 +252,11 @@ function arlimaNestedSortable(list) {
                     return false;
                 }
 
+                if ( ui.item[0].arlimaArticle.isDivider() && _nextIsChild(ui) ) {
+                    $(this).sortable('cancel');
+                    return false;
+                }
+
                 if( list.data.isImported ) {
                     ui.item[0].arlimaArticle.listID = listContainerElem.arlimaList.data.id;
                     ui.item[0].arlimaArticle.addClickEvents( !list.data.isImported );
@@ -346,7 +346,7 @@ function arlimaNestedSortable(list) {
 
                 // Check if divider is inside a group, if so add
                 // red background to helper object
-                if ( ui.item[0].arlimaArticle.isDivider() ) {
+                if ( ui.item[0].arlimaArticle && ui.item[0].arlimaArticle.isDivider() ) {
                     ui.placeholder.css('background-color', _nextIsChild(ui) ? 'red' : '');
                 }
 

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Contributors: @chredd, @znoid, @victor_jonsson, @lefalque, @aaslun
 Tags: CMS, e-paper, e-magazine, magazine, newspaper, front page, wysiwyg
 Requires at least: 3.8
 Tested up to: 3.9.1
-Stable tag: 3.0.beta.45
+Stable tag: 3.0.beta.46
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html