dynatree-rails 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc143706952222b9c7aabe573896e0f72d4966cd
-  data.tar.gz: 73b8770cd91a5030ca8c3275d0a629a0f36a3a74
+  metadata.gz: d12cfedbe8350e09f9a774b9229827027cf96374
+  data.tar.gz: e54844751da774320a9765b99dcaf90d84287663
 SHA512:
-  metadata.gz: 46db33e70c3f3b3e0c1aacc945cddfc53ab18746455e4aaa5a363e8e90680332d83b89f333458ef39f77cb0b879b65132d5cc876f53fb2a046a9e320bff0409b
-  data.tar.gz: 3e6ac8c3f2420cefeda8fd0336998009cc938e82635da685763db7d72015eb43d88f853077e58be83473cdf535e26e770c0657c47f7ab0ca02ae40ad77afbcd4
+  metadata.gz: 0dea6bf8dbd54aa8f2d9d7d4933ab771d9f0bc4e865b12df73699b4b007d4d8ab2d0a1974c8e5284d7296bcc68d04d4d8d3a8ca8c9ed4a1ecececc5f38b38a27
+  data.tar.gz: 993a0da0d38d6dee5f148ecf534935099741c490c48b950194d252059c5a7b4c1776fd1e8862020c5e12f1f9432e86eae2c3d71aa1b81f9551b9d4ab81ef866f

data/README.md

@@ -96,5 +96,5 @@ Dynatree is
 
 This code is:
 
-	Copyright (c) 2012, GlebTV
+	Copyright (c) 2012-2014, Gleb Tv
 	Dual licensed under the MIT or GPL Version 2 licenses.

data/{vendor → app}/assets/javascripts/dynatree/jquery.dynatree.js

@@ -2,15 +2,15 @@
 	jquery.dynatree.js
 	Dynamic tree view control, with support for lazy loading of branches.
 
-	Copyright (c) 2006-2013, Martin Wendt (http://wwWendt.de)
+	Copyright (c) 2006-2014, Martin Wendt (http://wwWendt.de)
 	Dual licensed under the MIT or GPL Version 2 licenses.
 	http://code.google.com/p/dynatree/wiki/LicenseInfo
 
 	A current version and some documentation is available at
 		http://dynatree.googlecode.com/
 
-	@version: DEVELOPMENT
-	@date:    DEVELOPMENT
+	@version: 1.2.6
+	@date:    2014-05-11T15:38
 
 	@depends: jquery.js
 	@depends: jquery.ui.core.js
@@ -500,13 +500,15 @@ DynaTreeNode.prototype = {
 	},
 	/** Return '/id1/id2/id3'. */
 	getKeyPath: function(excludeSelf) {
-		var path = [];
+		var path = [],
+			sep = this.tree.options.keyPathSeparator;
+
 		this.visitParents(function(node){
 			if(node.parent){
 				path.unshift(node.data.key);
 			}
 		}, !excludeSelf);
-		return "/" + path.join(this.tree.options.keyPathSeparator);
+		return sep + path.join(sep);
 	},
 
 	getParent: function() {
@@ -767,7 +769,7 @@ DynaTreeNode.prototype = {
 					return "title";
 				}else if( cn.className==cns.expander ){
 					return "expander";
-				}else if( cn.className==cns.checkbox ){
+				}else if( cn.className==cns.checkbox || cn.className==cns.radio ){
 					return "checkbox";
 				}else if( cn.className==cns.nodeIcon ){
 					return "icon";
@@ -778,7 +780,7 @@ DynaTreeNode.prototype = {
 	},
 
 	getEventTargetType: function(event) {
-		// Return the part of a node, that a click event occured on.
+		// Return the part of a node, that a click event occurred on.
 		// Note: there is no check, if the event was fired on THIS node.
 		var tcn = event && event.target ? event.target.className : "",
 			cns = this.tree.options.classNames;
@@ -787,7 +789,7 @@ DynaTreeNode.prototype = {
 			return "title";
 		}else if( tcn.indexOf(cns.expander) >= 0 ){
 			return "expander";
-		}else if( tcn.indexOf(cns.checkbox) >= 0 ){
+		}else if( tcn.indexOf(cns.checkbox) >= 0 || tcn.indexOf(cns.radio) >= 0 ){
 			return "checkbox";
 		}else if( tcn.indexOf(cns.nodeIcon) >= 0 ){
 			return "icon";
@@ -837,10 +839,10 @@ DynaTreeNode.prototype = {
 		if( this.data.isStatusNode ){
 			return;
 		}
-		if ( fireEvents && opts.onQueryActivate && opts.onQueryActivate.call(this.tree, flag, this) === false ){
-			return; // Callback returned false
-		}
 		if( flag ) {
+			if ( fireEvents && opts.onQueryActivate && opts.onQueryActivate.call(this.tree, flag, this) === false ){
+				return; // Callback returned false
+			}
 			// Activate
 			if( this.tree.activeNode ) {
 				if( this.tree.activeNode === this ){
@@ -1827,7 +1829,9 @@ DynaTreeNode.prototype = {
 			success: function(data, textStatus, jqXHR){
 				// <this> is the request options
 //              self.tree.logDebug("appendAjax().success");
-				var prevPhase = self.tree.phase;
+				var prevPhase = self.tree.phase,
+					options = self.tree.options; // #473
+
 				self.tree.phase = "init";
 				// postProcess is similar to the standard dataFilter hook,
 				// but it is also called for JSONP
@@ -1907,7 +1911,7 @@ DynaTreeNode.prototype = {
 			this.parent.childList.splice(pos, 1);
 		}
 		// Remove from source DOM parent
-		if(this.parent.ul){
+		if(this.parent.ul && this.li){
 			this.parent.ul.removeChild(this.li);
 		}
 
@@ -1947,7 +1951,9 @@ DynaTreeNode.prototype = {
 			// (Hidden, because it will be
 			targetParent.ul = document.createElement("ul");
 			targetParent.ul.style.display = "none";
-			targetParent.li.appendChild(targetParent.ul);
+			if( targetParent.li ){
+				targetParent.li.appendChild(targetParent.ul);
+			}
 		}
 		// Issue 319: Add to target DOM parent (only if node was already rendered(expanded))
 		if(this.li){
@@ -2774,8 +2780,8 @@ TODO: better?
 		case "helper":
 			// Only event and node argument is available
 			var $helper = $("<div class='dynatree-drag-helper'><span class='dynatree-drag-helper-img' /></div>")
-				.append($(event.target).closest(".dynatree-title").clone());
-//              .append($(event.target).closest('a').clone());
+					// .append($(event.target).closest(".dynatree-title").clone());
+					.append(nodeTag.find(".dynatree-title").clone());
 			// issue 244: helper should be child of scrollParent
 			$("ul.dynatree-container", node.tree.divTree).append($helper);
 //          $(node.tree.divTree).append($helper);
@@ -3090,9 +3096,9 @@ if(versionCompare($.ui.version, "1.8") < 0){
  */
 $.extend($.ui.dynatree, {
 	/** @type {String} */
-	version: "DEVELOPMENT",
+	version: "1.2.6",
 	/** @type {String} */
-	buildType: "DEVELOP",
+	buildType: "release",
 	/** Expose class object as $.ui.dynatree._DynaTreeClass */
 	_DynaTreeClass: DynaTree,
 	/** Expose class object as $.ui.dynatree._DynaTreeNodeClass */
@@ -3221,6 +3227,7 @@ $.ui.dynatree.prototype.options = {
 		expander: "dynatree-expander",
 		connector: "dynatree-connector",
 		checkbox: "dynatree-checkbox",
+		radio: "dynatree-radio",
 		nodeIcon: "dynatree-icon",
 		title: "dynatree-title",
 		noConnector: "dynatree-no-connector",
@@ -3241,7 +3248,7 @@ $.ui.dynatree.prototype.options = {
 		partsel: "dynatree-partsel",
 		lastsib: "dynatree-lastsib"
 	},
-	debugLevel: 2, // 0:quiet, 1:normal, 2:debug
+	debugLevel: 1, // 0:quiet, 1:normal, 2:debug
 
 	// ------------------------------------------------------------------------
 	lastentry: undefined

data/{vendor/assets/stylesheets/dynatree/skin-vista.sass → app/assets/stylesheets/dynatree/skin-vista.css.sass}

@@ -13,8 +13,8 @@ ul
     background-color: white
     border: 1px dotted gray
     overflow: auto
-    height: 100%
-    /* issue 263
+    /*  height: 100%; /* issue 263, 470
+    min-height: 0%
     ul
       padding: 0 0 0 16px
       margin: 0
@@ -46,7 +46,7 @@ ul
 
 .ui-dynatree-disabled ul.dynatree-container
   opacity: 0.5
-  /*  filter: alpha(opacity=50); /* Yields a css warning
+  /*    filter: alpha(opacity=50); /* Yields a css warning
   background-color: silver
 
 /*******************************************************************************
@@ -69,8 +69,8 @@ span
 #dynatree-drop-marker
   width: 16px
   height: 16px
-  /*  display: -moz-inline-box; /* @ FF 1+2 removed for issue 221
-  /*  -moz-box-align: start; /* issue 221
+  /*    display: -moz-inline-box; /* @ FF 1+2 removed for issue 221
+  /*    -moz-box-align: start; /* issue 221
   display: inline-block
   /* Required to make a span sizeable
   vertical-align: top
@@ -115,7 +115,7 @@ span
 /*******************************************************************************
  * Expander icon
  * Note: IE6 doesn't correctly evaluate multiples class names,
- *     so we create combined class names that can be used in the CSS.
+ *       so we create combined class names that can be used in the CSS.
  *
  * Prefix: dynatree-exp-
  * 1st character: 'e': expanded, 'c': collapsed
@@ -177,7 +177,7 @@ span.dynatree-radio
 /*******************************************************************************
  * Node type icon
  * Note: IE6 doesn't correctly evaluate multiples class names,
- *     so we create combined class names that can be used in the CSS.
+ *       so we create combined class names that can be used in the CSS.
  *
  * Prefix: dynatree-ico-
  * 1st character: 'e': expanded, 'c': collapsed
@@ -203,7 +203,7 @@ span.dynatree-icon
 
 .dynatree-statusnode-error span.dynatree-icon
   background-position: 0px -112px
-  /*  background-image: url("ltError.gif");
+  /*    background-image: image-url("dynatree/skin-vista/ltError.gif");
 
 /*******************************************************************************
  * Node titles
@@ -212,9 +212,11 @@ span.dynatree-icon
  * Removed again for issue 165; (133 couldn't be reproduced)
 
 span.dynatree-node
-  /*  display: -moz-inline-box; /* issue 133, 165, 172, 192. removed for issue 221
-  /*  -moz-box-align: start; /* issue 221
-  /*  display: inline-block; /* Required to make a span sizeable
+  /*    display: -moz-inline-box; /* issue 133, 165, 172, 192. removed for issue 221
+  /*    -moz-box-align: start; /* issue 221
+  display: inline-block
+  /* issue 373 Required to make a span sizeable
+  vertical-align: top
 
 /* Remove blue color and underline from title links
 
@@ -225,7 +227,7 @@ ul.dynatree-container a
   vertical-align: top
   margin: 0px
   margin-left: 3px
-  /*  outline: 0; /* @ Firefox, prevent dotted border after click
+  /*    outline: 0; /* @ Firefox, prevent dotted border after click
   /* Set transparent border to prevent jumping when active node gets a border
    * (we can do this, because this theme doesn't use vertical lines)
   border: 1px solid white

data/{vendor/assets/stylesheets/dynatree/skin.sass → app/assets/stylesheets/dynatree/skin.css.sass}

@@ -13,8 +13,8 @@ ul
     background-color: white
     border: 1px dotted gray
     overflow: auto
-    height: 100%
-    /* issue 263
+    /*  height: 100%; /* issue 263, 470
+    min-height: 0%
     ul
       padding: 0 0 0 16px
       margin: 0
@@ -48,7 +48,7 @@ ul
 
 .ui-dynatree-disabled ul.dynatree-container
   opacity: 0.5
-  /*  filter: alpha(opacity=50); /* Yields a css warning
+  /*    filter: alpha(opacity=50); /* Yields a css warning
   background-color: silver
 
 /*******************************************************************************
@@ -71,8 +71,8 @@ span
 #dynatree-drop-marker
   width: 16px
   height: 16px
-  /*  display: -moz-inline-box; /* @ FF 1+2 removed for issue 221
-  /*  -moz-box-align: start; /* issue 221
+  /*    display: -moz-inline-box; /* @ FF 1+2 removed for issue 221
+  /*    -moz-box-align: start; /* issue 221
   display: inline-block
   /* Required to make a span sizeable
   vertical-align: top
@@ -103,7 +103,7 @@ span
 /*******************************************************************************
  * Expander icon
  * Note: IE6 doesn't correctly evaluate multiples class names,
- *     so we create combined class names that can be used in the CSS.
+ *       so we create combined class names that can be used in the CSS.
  *
  * Prefix: dynatree-exp-
  * 1st character: 'e': expanded, 'c': collapsed
@@ -172,7 +172,7 @@ span.dynatree-radio
 /*******************************************************************************
  * Node type icon
  * Note: IE6 doesn't correctly evaluate multiples class names,
- *     so we create combined class names that can be used in the CSS.
+ *       so we create combined class names that can be used in the CSS.
  *
  * Prefix: dynatree-ico-
  * 1st character: 'e': expanded, 'c': collapsed
@@ -195,7 +195,7 @@ span.dynatree-icon
 
 .dynatree-statusnode-error span.dynatree-icon
   background-position: 0px -112px
-  /*  background-image: image-url("dynatree/skin/ltError.gif");
+  /*    background-image: image-url("dynatree/skin/ltError.gif");
 
 /*******************************************************************************
  * Node titles
@@ -204,9 +204,11 @@ span.dynatree-icon
  * Removed again for issue 165; (133 couldn't be reproduced)
 
 span.dynatree-node
-  /*  display: -moz-inline-box; /* issue 133, 165, 172, 192. removed for issue 221
-  /*  -moz-box-align: start; /* issue 221
-  /*  display: inline-block; /* Required to make a span sizeable
+  /*    display: -moz-inline-box; /* issue 133, 165, 172, 192. removed for issue 221
+  /*    -moz-box-align: start; /* issue 221
+  display: inline-block
+  /* issue 373 Required to make a span sizeable
+  vertical-align: top
 
 /* Remove blue color and underline from title links
 
@@ -217,7 +219,7 @@ ul.dynatree-container a
   vertical-align: top
   margin: 0px
   margin-left: 3px
-  /*  outline: 0; /* @ Firefox, prevent dotted border after click
+  /*    outline: 0; /* @ Firefox, prevent dotted border after click
   &:hover
     /*  text-decoration: underline;
     background-color: #F2F7FD
@@ -247,6 +249,7 @@ span
   &.dynatree-focused a:link
     background-color: #EFEBDE
     /* gray
+  &.dynatree-has-children! a, &.dynatree-expanded! a
   &.dynatree-selected a
     color: green
     font-style: italic
@@ -290,7 +293,7 @@ div
   position: absolute
   background-position: 0 -128px
   margin: 0
-  /*  border: 1px solid red;
+  /*    border: 1px solid red;
   &.dynatree-drop-after, &.dynatree-drop-before
     width: 64px
     background-position: 0 -144px
@@ -301,14 +304,22 @@ div
 
 span
   &.dynatree-drag-source
+    /* border: 1px dotted gray;
     background-color: #e0e0e0
     a
       color: gray
   &.dynatree-drop-target
+    /*border: 1px solid gray;
+    a!
     &.dynatree-drop-accept a
+      /*border: 1px solid green;
       background-color: #3169C6 !important
       color: white !important
+      /* @ IE6
       text-decoration: none
+    &.dynatree-drop-reject
+      /*border: 1px solid red;
+    &.dynatree-drop-after! a
   &.custom1 a
     background-color: maroon
     color: yellow
@@ -316,4 +327,4 @@ span
 /*** Target node while dragging cursor is over it ****************************
 
 /*******************************************************************************
- * Custom node classes (sample)
+ * Custom node classes (sample)

data/dynatree-rails.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Gleb Tv"]
   gem.email         = ["glebtv@gmail.com"]
   gem.description   = %q{}
-  gem.summary       = %q{Dynatree integration for rails 3.1 asset pipeline}
+  gem.summary       = %q{Dynatree integration for rails asset pipeline}
   gem.homepage      = "https://github.com/glebtv/dynatree-rails"
 
   gem.files         = `git ls-files`.split($\)

data/lib/dynatree-rails/version.rb

@@ -1,5 +1,5 @@
 module Dynatree
   module Rails
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynatree-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Gleb Tv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies: []
 description: ''
 email:
@@ -25,21 +25,21 @@ files:
 - MIT-License.txt
 - README.md
 - Rakefile
+- app/assets/images/dynatree/skin-vista/icons.gif
+- app/assets/images/dynatree/skin-vista/loading.gif
+- app/assets/images/dynatree/skin/icons-rtl.gif
+- app/assets/images/dynatree/skin/icons.gif
+- app/assets/images/dynatree/skin/loading.gif
+- app/assets/images/dynatree/skin/vline-rtl.gif
+- app/assets/images/dynatree/skin/vline.gif
+- app/assets/javascripts/dynatree/jquery.dynatree.js
+- app/assets/stylesheets/dynatree/skin-vista.css.sass
+- app/assets/stylesheets/dynatree/skin.css.sass
 - dynatree-rails.gemspec
 - lib/dynatree-rails.rb
 - lib/dynatree-rails/engine.rb
 - lib/dynatree-rails/renderer.rb
 - lib/dynatree-rails/version.rb
-- vendor/assets/images/dynatree/skin-vista/icons.gif
-- vendor/assets/images/dynatree/skin-vista/loading.gif
-- vendor/assets/images/dynatree/skin/icons-rtl.gif
-- vendor/assets/images/dynatree/skin/icons.gif
-- vendor/assets/images/dynatree/skin/loading.gif
-- vendor/assets/images/dynatree/skin/vline-rtl.gif
-- vendor/assets/images/dynatree/skin/vline.gif
-- vendor/assets/javascripts/dynatree/jquery.dynatree.js
-- vendor/assets/stylesheets/dynatree/skin-vista.sass
-- vendor/assets/stylesheets/dynatree/skin.sass
 homepage: https://github.com/glebtv/dynatree-rails
 licenses: []
 metadata: {}
@@ -59,8 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Dynatree integration for rails 3.1 asset pipeline
+summary: Dynatree integration for rails asset pipeline
 test_files: []