2.3.2

markgoodyear · Apr 3, 2014 · 6a43f3b · 6a43f3b
1 parent 691f0d8
commit 6a43f3b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.3.2
+- Allow to fully disable scrollTitle
+
 ## 2.3.1
 - Update jQuery to 1.11.0
 - Fix bug with jQuery 1.11.0

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ScrollUp 2.3.1 [![Build Status](https://travis-ci.org/markgoodyear/scrollup.png?branch=master)](https://travis-ci.org/markgoodyear/scrollup)
+# ScrollUp 2.3.2 [![Build Status](https://travis-ci.org/markgoodyear/scrollup.png?branch=master)](https://travis-ci.org/markgoodyear/scrollup)
 
 ## Installing with Bower
 To install scrollUp with Bower:

diff --git a/js/jquery.scrollUp.js b/js/jquery.scrollUp.js
@@ -1,6 +1,6 @@
 /*
 
- scrollup v2.3.1
+ scrollup v2.3.2
  Author: Mark Goodyear - http://markgoodyear.com
  Git: https://github.com/markgoodyear/scrollup
 
@@ -29,20 +29,22 @@
         // Apply any options to the settings, override the defaults
         var o = $.fn.scrollUp.settings = $.extend({}, $.fn.scrollUp.defaults, options),
 
-        // Set scrollTitle
-        scrollTitle = (o.scrollTitle) ? o.scrollTitle : o.scrollText,
-
         // Create element
 		$self;
 		if (o.scrollTrigger) {
 			$self = $(o.scrollTrigger);
 		} else {
 	        $self = $('<a/>', {
 	            id: o.scrollName,
-	            href: '#top',
-	            title: scrollTitle
+	            href: '#top'
 	        });
 		}
+
+        // Set scrollTitle if there is one
+        if (o.scrollTitle) {
+            $self.attr('title', o.scrollTitle);
+        }
+
         $self.appendTo('body');
 
         // If not using an image display text

diff --git a/js/jquery.scrollUp.min.js b/js/jquery.scrollUp.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "scrollup",
   "title": "scrollUp",
   "description": "A jQuery plugin to create a customisable 'Scroll to top' feature that will work with any website, with ease.",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "year": "2014",
   "keywords": [
     "jquery",

diff --git a/src/jquery.scrollUp.js b/src/jquery.scrollUp.js
@@ -16,20 +16,22 @@
         // Apply any options to the settings, override the defaults
         var o = $.fn.scrollUp.settings = $.extend({}, $.fn.scrollUp.defaults, options),
 
-        // Set scrollTitle
-        scrollTitle = (o.scrollTitle) ? o.scrollTitle : o.scrollText,
-
         // Create element
 		$self;
 		if (o.scrollTrigger) {
 			$self = $(o.scrollTrigger);
 		} else {
 	        $self = $('<a/>', {
 	            id: o.scrollName,
-	            href: '#top',
-	            title: scrollTitle
+	            href: '#top'
 	        });
 		}
+
+        // Set scrollTitle if there is one
+        if (o.scrollTitle) {
+            $self.attr('title', o.scrollTitle);
+        }
+
         $self.appendTo('body');
 
         // If not using an image display text