social_stream-base 0.17.1 → 0.17.2

data/app/assets/javascripts/layouts.js

@@ -1,6 +1,5 @@
 //= require hoverIntent
 //= require superfish
-//= require jquery.watermarkinput
 //
 $(function() {
     jQuery('ul.sf-menu').superfish({

data/app/assets/javascripts/social_stream.comments.js

@@ -1,3 +1,5 @@
+//= require jquery.watermark
+//
 //= require social_stream.timeline
 //= require social_stream.objects
 
@@ -15,7 +17,7 @@ SocialStream.Comments = (function(SS, $, undefined){
 		$(".actor_name_new_comment").hide();
 		$(".actor_logo_new_comment").hide();
 
-		$(".input_new_comments").Watermark(I18n.t('comment.input'),"#666");
+		$(".input_new_comments").watermark(I18n.t('comment.input'),"#666");
 
 		$(".input_new_comments")
 			.change(function(){autoSize(this);})
@@ -40,8 +42,13 @@ SocialStream.Comments = (function(SS, $, undefined){
 		//javascript for tocomment option
 		$(".to_comment").click(function(){
 			$(this).parents(".activity_content").find(".activity_new_comment").show();
-			$(this).parents(".activity_content").find(".input_new_comments").click();  
-			$(this).parents(".activity_content").find(".input_new_comments").focus();
+			$(this)
+			.closest(".activity_content")
+			.find(".input_new_comments")
+			.click()
+			.focus()
+			.val("");
+
 			return false;
 		});
 	}

data/app/assets/javascripts/social_stream.search.js.erb

@@ -1,3 +1,5 @@
+//= require jquery.watermark
+
 SocialStream.Search = (function(SS, $, undefined){
   function init(){
     $.preloadImages ("<%= asset_path "mini-loading.gif" %>");
@@ -17,7 +19,7 @@ SocialStream.Search = (function(SS, $, undefined){
       return true;
     });
 
-    $("#global_search_input").Watermark(I18n.t('search.write'));
+    $("#global_search_input").watermark(I18n.t('search.write'));
   }
 
   return {

data/app/assets/javascripts/social_stream.wall.js.erb

@@ -1,5 +1,7 @@
-//= require social_stream.timeline
+//= require jquery.watermark
 //
+//= require social_stream.timeline
+
 SocialStream.Wall = (function(SS, $, undefined){
   var initCallbacks = [];
 
@@ -23,6 +25,10 @@ SocialStream.Wall = (function(SS, $, undefined){
     });
   }
 
+  var initPostWatermark = function(){
+    $("#input_activities").watermark(I18n.t('post.input'), "#666");
+  }
+
   var initFormSelector = function(){
     $('.activity_form_selector').click(function(){
       $('.activity_form_selector').removeClass('selected');
@@ -129,6 +135,7 @@ SocialStream.Wall = (function(SS, $, undefined){
 
   addInitCallback(initFirstForm);
   addInitCallback(initFormButton);
+  addInitCallback(initPostWatermark );
   addInitCallback(initFormSelector);
   addInitCallback(initSecuritySelect);
   addInitCallback(activateAntiRebounds);

data/app/assets/stylesheets/{activities.css.scss → activities.css.scss.erb}

@@ -8,7 +8,7 @@
 
 /* Fixes to tipsy, the plugin for tooltips */
 
-.tipsy{ background-image: url(../assets/tipsy.gif); }
+.tipsy{ background-image: url(<%= asset_path "tipsy.gif" %>); }
 .tipsy-inner { background-color: $secondary-color; color: $sentence-color; }
 
 /****************** WALL - ACTIVITIES *********************/

data/app/models/relation.rb

@@ -63,6 +63,10 @@ class Relation < ActiveRecord::Base
     where(:sender_type => st, :receiver_type => rt)
   }
 
+  scope :positive, lambda {
+    where(:type => positive_names)
+  }
+
   before_create :initialize_sender_type
 
   class << self

data/app/models/tie.rb

@@ -48,6 +48,11 @@ class Tie < ActiveRecord::Base
     end
   }
 
+  scope :positive, lambda {
+    joins(:relation).
+      merge(Relation.positive)
+  }
+
   scope :with_permissions, lambda { |action, object|
     joins(:relation => :permissions).
       where('permissions.action' => action).

data/app/views/cheesecake/_index.html.erb

@@ -48,7 +48,7 @@
   $("#center_body").css("width","782px");
   $("#center_body").css("max-width","782px");
   $("#content").css("width","782px");
-  $("#contacts_filter_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
+  $("#contacts_filter_input").watermark("<%= escape_javascript(I18n.t('search.name')) %>");
   //When clicking an unselected actor
   var unselected_actor_click = function(){
     var clone = $(this).clone();
@@ -138,4 +138,4 @@
     });
   });
   <%= render :partial => 'cheesecake' %>
-<% end %>
+<% end %>

data/app/views/layouts/_search.html.erb

@@ -27,7 +27,7 @@ $(document).ready(function() {
   	$("#header_search_display").hide();
   });
   
-  $("#header_search_input").Watermark("<%= escape_javascript(I18n.t('search.name')) %>");
+  $("#header_search_input").watermark("<%= escape_javascript(I18n.t('search.name')) %>");
 
   $("#header_search_input").keyup(function() {
     var searchstring = $(this).val();
@@ -59,4 +59,4 @@ $(document).ready(function() {
     return false;
   });  
 })
-<% end %>
+<% end %>

data/app/views/posts/_new_activity_fields.erb

@@ -1,7 +1 @@
 <%= f.text_field :text, :id => "input_activities", :size => 85 %>
-
-<%= javascript_tag do %>
-  $(function() {
-    $("#input_activities").Watermark("<%= I18n.t('post.input') %>","#666");
-  });
-<% end %>

data/lib/generators/social_stream/base/templates/relations.yml

@@ -1,11 +1,11 @@
 # Default relations for Social Stream
 #
-# Define the default relations and permissions supported by your application
-# Though subjects can customize their own relations, these are the defaults
-# to start up 
+# Define the default relations and permissions offered by your application
+# Though subjects (user, groups, etc.) can customize their own relations,
+# these are the defaults to start up with
 #
 # Detailed information on permissions is available at:
-# http://rdoc.info/gems/social_stream/Permission
+# http://rdoc.info/gems/social_stream-base/Permission
 #
 user:
   friend:

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.17.1".freeze
+    VERSION = "0.17.2".freeze
   end
 end

data/lib/tasks/db/populate.rake

@@ -162,7 +162,7 @@ namespace :db do
       puts 'Post population'
       posts_start = Time.now
 
-      SocialStream::Populate.power_law(Tie.all) do |t|
+      SocialStream::Populate.power_law(Tie.positive.all) do |t|
         updated = Time.at(rand(Time.now.to_i))
 
         author = t.sender
@@ -170,7 +170,7 @@ namespace :db do
         user_author = ( t.sender.subject_type == "User" ? t.sender : t.sender.user_author )
 
         p = Post.create :text =>
-                      "This post sActorhould be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
+                      "This post should be for #{ t.relation.name } of #{ t.sender.name }.\n#{ Forgery::LoremIpsum.paragraph(:random => true) }",
                         :created_at => Time.at(rand(updated.to_i)),
                         :updated_at => updated,
                         :author_id  => author.id,

data/spec/dummy/config/relations.yml

@@ -1,11 +1,11 @@
 # Default relations for Social Stream
 #
-# Define the default relations and permissions supported by your application
-# Though subjects can customize their own relations, these are the defaults
-# to start up 
+# Define the default relations and permissions offered by your application
+# Though subjects (user, groups, etc.) can customize their own relations,
+# these are the defaults to start up with
 #
 # Detailed information on permissions is available at:
-# http://rdoc.info/gems/social_stream/Permission
+# http://rdoc.info/gems/social_stream-base/Permission
 #
 user:
   friend:

data/vendor/assets/javascripts/jquery.watermark.js

@@ -0,0 +1,563 @@
+/*	
+	Watermark plugin for jQuery
+	Version: 3.1.3
+	http://jquery-watermark.googlecode.com/
+
+	Copyright (c) 2009-2011 Todd Northrop
+	http://www.speednet.biz/
+	
+	March 22, 2011
+
+	Requires:  jQuery 1.2.3+
+	
+	Dual licensed under the MIT or GPL Version 2 licenses.
+	See mit-license.txt and gpl2-license.txt in the project root for details.
+------------------------------------------------------*/
+
+(function ($, window, undefined) {
+
+var
+	// String constants for data names
+	dataFlag = "watermark",
+	dataClass = "watermarkClass",
+	dataFocus = "watermarkFocus",
+	dataFormSubmit = "watermarkSubmit",
+	dataMaxLen = "watermarkMaxLength",
+	dataPassword = "watermarkPassword",
+	dataText = "watermarkText",
+	
+	// Copy of native jQuery regex use to strip return characters from element value
+	rreturn = /\r/g,
+
+	// Includes only elements with watermark defined
+	selWatermarkDefined = "input:data(" + dataFlag + "),textarea:data(" + dataFlag + ")",
+
+	// Includes only elements capable of having watermark
+	selWatermarkAble = "input:text,input:password,input[type=search],input:not([type]),textarea",
+	
+	// triggerFns:
+	// Array of function names to look for in the global namespace.
+	// Any such functions found will be hijacked to trigger a call to
+	// hideAll() any time they are called.  The default value is the
+	// ASP.NET function that validates the controls on the page
+	// prior to a postback.
+	// 
+	// Am I missing other important trigger function(s) to look for?
+	// Please leave me feedback:
+	// http://code.google.com/p/jquery-watermark/issues/list
+	triggerFns = [
+		"Page_ClientValidate"
+	],
+	
+	// Holds a value of true if a watermark was displayed since the last
+	// hideAll() was executed. Avoids repeatedly calling hideAll().
+	pageDirty = false,
+	
+	// Detects if the browser can handle native placeholders
+	hasNativePlaceholder = ("placeholder" in document.createElement("input"));
+
+// Best practice: this plugin adds only one method to the jQuery object.
+// Also ensures that the watermark code is only added once.
+$.watermark = $.watermark || {
+
+	// Current version number of the plugin
+	version: "3.1.3",
+		
+	runOnce: true,
+	
+	// Default options used when watermarks are instantiated.
+	// Can be changed to affect the default behavior for all
+	// new or updated watermarks.
+	options: {
+		
+		// Default class name for all watermarks
+		className: "watermark",
+		
+		// If true, plugin will detect and use native browser support for
+		// watermarks, if available. (e.g., WebKit's placeholder attribute.)
+		useNative: true,
+		
+		// If true, all watermarks will be hidden during the window's
+		// beforeunload event. This is done mainly because WebKit
+		// browsers remember the watermark text during navigation
+		// and try to restore the watermark text after the user clicks
+		// the Back button. We can avoid this by hiding the text before
+		// the browser has a chance to save it. The regular unload event
+		// was tried, but it seems the browser saves the text before
+		// that event kicks off, because it didn't work.
+		hideBeforeUnload: true
+	},
+	
+	// Hide one or more watermarks by specifying any selector type
+	// i.e., DOM element, string selector, jQuery matched set, etc.
+	hide: function (selector) {
+		$(selector).filter(selWatermarkDefined).each(
+			function () {
+				$.watermark._hide($(this));
+			}
+		);
+	},
+	
+	// Internal use only.
+	_hide: function ($input, focus) {
+		var elem = $input[0],
+			inputVal = (elem.value || "").replace(rreturn, ""),
+			inputWm = $input.data(dataText) || "",
+			maxLen = $input.data(dataMaxLen) || 0,
+			className = $input.data(dataClass);
+	
+		if ((inputWm.length) && (inputVal == inputWm)) {
+			elem.value = "";
+			
+			// Password type?
+			if ($input.data(dataPassword)) {
+				
+				if (($input.attr("type") || "") === "text") {
+					var $pwd = $input.data(dataPassword) || [], 
+						$wrap = $input.parent() || [];
+						
+					if (($pwd.length) && ($wrap.length)) {
+						$wrap[0].removeChild($input[0]); // Can't use jQuery methods, because they destroy data
+						$wrap[0].appendChild($pwd[0]);
+						$input = $pwd;
+					}
+				}
+			}
+			
+			if (maxLen) {
+				$input.attr("maxLength", maxLen);
+				$input.removeData(dataMaxLen);
+			}
+		
+			if (focus) {
+				$input.attr("autocomplete", "off");  // Avoid NS_ERROR_XPC_JS_THREW_STRING error in Firefox
+				
+				window.setTimeout(
+					function () {
+						$input.select();  // Fix missing cursor in IE
+					}
+				, 1);
+			}
+		}
+		
+		className && $input.removeClass(className);
+	},
+	
+	// Display one or more watermarks by specifying any selector type
+	// i.e., DOM element, string selector, jQuery matched set, etc.
+	// If conditions are not right for displaying a watermark, ensures that watermark is not shown.
+	show: function (selector) {
+		$(selector).filter(selWatermarkDefined).each(
+			function () {
+				$.watermark._show($(this));
+			}
+		);
+	},
+	
+	// Internal use only.
+	_show: function ($input) {
+		var elem = $input[0],
+			val = (elem.value || "").replace(rreturn, ""),
+			text = $input.data(dataText) || "",
+			type = $input.attr("type") || "",
+			className = $input.data(dataClass);
+
+		if (((val.length == 0) || (val == text)) && (!$input.data(dataFocus))) {
+			pageDirty = true;
+		
+			// Password type?
+			if ($input.data(dataPassword)) {
+				
+				if (type === "password") {
+					var $pwd = $input.data(dataPassword) || [],
+						$wrap = $input.parent() || [];
+						
+					if (($pwd.length) && ($wrap.length)) {
+						$wrap[0].removeChild($input[0]); // Can't use jQuery methods, because they destroy data
+						$wrap[0].appendChild($pwd[0]);
+						$input = $pwd;
+						$input.attr("maxLength", text.length);
+						elem = $input[0];
+					}
+				}
+			}
+		
+			// Ensure maxLength big enough to hold watermark (input of type="text" or type="search" only)
+			if ((type === "text") || (type === "search")) {
+				var maxLen = $input.attr("maxLength") || 0;
+				
+				if ((maxLen > 0) && (text.length > maxLen)) {
+					$input.data(dataMaxLen, maxLen);
+					$input.attr("maxLength", text.length);
+				}
+			}
+            
+			className && $input.addClass(className);
+			elem.value = text;
+		}
+		else {
+			$.watermark._hide($input);
+		}
+	},
+	
+	// Hides all watermarks on the current page.
+	hideAll: function () {
+		if (pageDirty) {
+			$.watermark.hide(selWatermarkAble);
+			pageDirty = false;
+		}
+	},
+	
+	// Displays all watermarks on the current page.
+	showAll: function () {
+		$.watermark.show(selWatermarkAble);
+	}
+};
+
+$.fn.watermark = $.fn.watermark || function (text, options) {
+	///	<summary>
+	///		Set watermark text and class name on all input elements of type="text/password/search" and
+	/// 	textareas within the matched set. If className is not specified in options, the default is
+	/// 	"watermark". Within the matched set, only input elements with type="text/password/search"
+	/// 	and textareas are affected; all other elements are ignored.
+	///	</summary>
+	///	<returns type="jQuery">
+	///		Returns the original jQuery matched set (not just the input and texarea elements).
+	/// </returns>
+	///	<param name="text" type="String">
+	///		Text to display as a watermark when the input or textarea element has an empty value and does not
+	/// 	have focus. The first time watermark() is called on an element, if this argument is empty (or not
+	/// 	a String type), then the watermark will have the net effect of only changing the class name when
+	/// 	the input or textarea element's value is empty and it does not have focus.
+	///	</param>
+	///	<param name="options" type="Object" optional="true">
+	///		Provides the ability to override the default watermark options ($.watermark.options). For backward
+	/// 	compatibility, if a string value is supplied, it is used as the class name that overrides the class
+	/// 	name in $.watermark.options.className. Properties include:
+	/// 		className: When the watermark is visible, the element will be styled using this class name.
+	/// 		useNative (Boolean or Function): Specifies if native browser support for watermarks will supersede
+	/// 			plugin functionality. If useNative is a function, the return value from the function will
+	/// 			determine if native support is used. The function is passed one argument -- a jQuery object
+	/// 			containing the element being tested as the only element in its matched set -- and the DOM
+	/// 			element being tested is the object on which the function is invoked (the value of "this").
+	///	</param>
+	/// <remarks>
+	///		The effect of changing the text and class name on an input element is called a watermark because
+	///		typically light gray text is used to provide a hint as to what type of input is required. However,
+	///		the appearance of the watermark can be something completely different: simply change the CSS style
+	///		pertaining to the supplied class name.
+	///		
+	///		The first time watermark() is called on an element, the watermark text and class name are initialized,
+	///		and the focus and blur events are hooked in order to control the display of the watermark.  Also, as
+	/// 	of version 3.0, drag and drop events are hooked to guard against dropped text being appended to the
+	/// 	watermark.  If native watermark support is provided by the browser, it is detected and used, unless
+	/// 	the useNative option is set to false.
+	///		
+	///		Subsequently, watermark() can be called again on an element in order to change the watermark text
+	///		and/or class name, and it can also be called without any arguments in order to refresh the display.
+	///		
+	///		For example, after changing the value of the input or textarea element programmatically, watermark()
+	/// 	should be called without any arguments to refresh the display, because the change event is only
+	/// 	triggered by user actions, not by programmatic changes to an input or textarea element's value.
+	/// 	
+	/// 	The one exception to programmatic updates is for password input elements:  you are strongly cautioned
+	/// 	against changing the value of a password input element programmatically (after the page loads).
+	/// 	The reason is that some fairly hairy code is required behind the scenes to make the watermarks bypass
+	/// 	IE security and switch back and forth between clear text (for watermarks) and obscured text (for
+	/// 	passwords).  It is *possible* to make programmatic changes, but it must be done in a certain way, and
+	/// 	overall it is not recommended.
+	/// </remarks>
+	
+	if (!this.length) {
+		return this;
+	}
+	
+	var hasClass = false,
+		hasText = (typeof(text) === "string");
+	
+	if (hasText) {
+		text = text.replace(rreturn, "");
+	}
+	
+	if (typeof(options) === "object") {
+		hasClass = (typeof(options.className) === "string");
+		options = $.extend({}, $.watermark.options, options);
+	}
+	else if (typeof(options) === "string") {
+		hasClass = true;
+		options = $.extend({}, $.watermark.options, {className: options});
+	}
+	else {
+		options = $.watermark.options;
+	}
+	
+	if (typeof(options.useNative) !== "function") {
+		options.useNative = options.useNative? function () { return true; } : function () { return false; };
+	}
+	
+	return this.each(
+		function () {
+			var $input = $(this);
+			
+			if (!$input.is(selWatermarkAble)) {
+				return;
+			}
+			
+			// Watermark already initialized?
+			if ($input.data(dataFlag)) {
+			
+				// If re-defining text or class, first remove existing watermark, then make changes
+				if (hasText || hasClass) {
+					$.watermark._hide($input);
+			
+					if (hasText) {
+						$input.data(dataText, text);
+					}
+					
+					if (hasClass) {
+						$input.data(dataClass, options.className);
+					}
+				}
+			}
+			else {
+			
+				// Detect and use native browser support, if enabled in options
+				if (
+					(hasNativePlaceholder)
+					&& (options.useNative.call(this, $input))
+					&& (($input.attr("tagName") || "") !== "TEXTAREA")
+				) {
+					// className is not set because current placeholder standard doesn't
+					// have a separate class name property for placeholders (watermarks).
+					if (hasText) {
+						$input.attr("placeholder", text);
+					}
+					
+					// Only set data flag for non-native watermarks
+					// [purposely commented-out] -> $input.data(dataFlag, 1);
+					return;
+				}
+				
+				$input.data(dataText, hasText? text : "");
+				$input.data(dataClass, options.className);
+				$input.data(dataFlag, 1); // Flag indicates watermark was initialized
+				
+				// Special processing for password type
+				if (($input.attr("type") || "") === "password") {
+					var $wrap = $input.wrap("<span>").parent(),
+						$wm = $($wrap.html().replace(/type=["']?password["']?/i, 'type="text"'));
+					
+					$wm.data(dataText, $input.data(dataText));
+					$wm.data(dataClass, $input.data(dataClass));
+					$wm.data(dataFlag, 1);
+					$wm.attr("maxLength", text.length);
+					
+					$wm.focus(
+						function () {
+							$.watermark._hide($wm, true);
+						}
+					).bind("dragenter",
+						function () {
+							$.watermark._hide($wm);
+						}
+					).bind("dragend",
+						function () {
+							window.setTimeout(function () { $wm.blur(); }, 1);
+						}
+					);
+					$input.blur(
+						function () {
+							$.watermark._show($input);
+						}
+					).bind("dragleave",
+						function () {
+							$.watermark._show($input);
+						}
+					);
+					
+					$wm.data(dataPassword, $input);
+					$input.data(dataPassword, $wm);
+				}
+				else {
+					
+					$input.focus(
+						function () {
+							$input.data(dataFocus, 1);
+							$.watermark._hide($input, true);
+						}
+					).blur(
+						function () {
+							$input.data(dataFocus, 0);
+							$.watermark._show($input);
+						}
+					).bind("dragenter",
+						function () {
+							$.watermark._hide($input);
+						}
+					).bind("dragleave",
+						function () {
+							$.watermark._show($input);
+						}
+					).bind("dragend",
+						function () {
+							window.setTimeout(function () { $.watermark._show($input); }, 1);
+						}
+					).bind("drop",
+						// Firefox makes this lovely function necessary because the dropped text
+						// is merged with the watermark before the drop event is called.
+						function (evt) {
+							var elem = $input[0],
+								dropText = evt.originalEvent.dataTransfer.getData("Text");
+							
+							if ((elem.value || "").replace(rreturn, "").replace(dropText, "") === $input.data(dataText)) {
+								elem.value = dropText;
+							}
+							
+							$input.focus();
+						}
+					);
+				}
+				
+				// In order to reliably clear all watermarks before form submission,
+				// we need to replace the form's submit function with our own
+				// function.  Otherwise watermarks won't be cleared when the form
+				// is submitted programmatically.
+				if (this.form) {
+					var form = this.form,
+						$form = $(form);
+					
+					if (!$form.data(dataFormSubmit)) {
+						$form.submit($.watermark.hideAll);
+						
+						// form.submit exists for all browsers except Google Chrome
+						// (see "else" below for explanation)
+						if (form.submit) {
+							$form.data(dataFormSubmit, form.submit);
+							
+							form.submit = (function (f, $f) {
+								return function () {
+									var nativeSubmit = $f.data(dataFormSubmit);
+									
+									$.watermark.hideAll();
+									
+									if (nativeSubmit.apply) {
+										nativeSubmit.apply(f, Array.prototype.slice.call(arguments));
+									}
+									else {
+										nativeSubmit();
+									}
+								};
+							})(form, $form);
+						}
+						else {
+							$form.data(dataFormSubmit, 1);
+							
+							// This strangeness is due to the fact that Google Chrome's
+							// form.submit function is not visible to JavaScript (identifies
+							// as "undefined").  I had to invent a solution here because hours
+							// of Googling (ironically) for an answer did not turn up anything
+							// useful.  Within my own form.submit function I delete the form's
+							// submit function, and then call the non-existent function --
+							// which, in the world of Google Chrome, still exists.
+							form.submit = (function (f) {
+								return function () {
+									$.watermark.hideAll();
+									delete f.submit;
+									f.submit();
+								};
+							})(form);
+						}
+					}
+				}
+			}
+			
+			$.watermark._show($input);
+		}
+	);
+};
+
+// The code included within the following if structure is guaranteed to only run once,
+// even if the watermark script file is included multiple times in the page.
+if ($.watermark.runOnce) {
+	$.watermark.runOnce = false;
+
+	$.extend($.expr[":"], {
+
+		// Extends jQuery with a custom selector - ":data(...)"
+		// :data(<name>)  Includes elements that have a specific name defined in the jQuery data
+		// collection. (Only the existence of the name is checked; the value is ignored.)
+		// A more sophisticated version of the :data() custom selector originally part of this plugin
+		// was removed for compatibility with jQuery UI. The original code can be found in the SVN
+		// source listing in the file, "jquery.data.js".
+		data: function( elem, i, match ) {
+			return !!$.data( elem, match[ 3 ] );
+		}
+	});
+
+	// Overloads the jQuery .val() function to return the underlying input value on
+	// watermarked input elements.  When .val() is being used to set values, this
+	// function ensures watermarks are properly set/removed after the values are set.
+	// Uses self-executing function to override the default jQuery function.
+	(function (valOld) {
+
+		$.fn.val = function () {
+			
+			// Best practice: return immediately if empty matched set
+			if ( !this.length ) {
+				return arguments.length? this : undefined;
+			}
+
+			// If no args, then we're getting the value of the first element;
+			// otherwise we're setting values for all elements in matched set
+			if ( !arguments.length ) {
+
+				// If element is watermarked, get the underlying value;
+				// otherwise use native jQuery .val()
+				if ( this.data(dataFlag) ) {
+					var v = (this[0].value || "").replace(rreturn, "");
+					return (v === (this.data(dataText) || ""))? "" : v;
+				}
+				else {
+					return valOld.apply( this, arguments );
+				}
+			}
+			else {
+				valOld.apply( this, arguments );
+				$.watermark.show(this);
+				return this;
+			}
+		};
+
+	})($.fn.val);
+	
+	// Hijack any functions found in the triggerFns list
+	if (triggerFns.length) {
+
+		// Wait until DOM is ready before searching
+		$(function () {
+			var i, name, fn;
+		
+			for (i=triggerFns.length-1; i>=0; i--) {
+				name = triggerFns[i];
+				fn = window[name];
+				
+				if (typeof(fn) === "function") {
+					window[name] = (function (origFn) {
+						return function () {
+							$.watermark.hideAll();
+							return origFn.apply(null, Array.prototype.slice.call(arguments));
+						};
+					})(fn);
+				}
+			}
+		});
+	}
+
+	$(window).bind("beforeunload", function () {
+		if ($.watermark.options.hideBeforeUnload) {
+			$.watermark.hideAll();
+		}
+	});
+}
+
+})(jQuery, window);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.17.1
+  version: 0.17.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &76571270 !ruby/object:Gem::Requirement
+  requirement: &73996770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76571270
+  version_requirements: *73996770
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &76568600 !ruby/object:Gem::Requirement
+  requirement: &73996210 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *76568600
+  version_requirements: *73996210
 - !ruby/object:Gem::Dependency
   name: foreigner
-  requirement: &76567430 !ruby/object:Gem::Requirement
+  requirement: &73995510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *76567430
+  version_requirements: *73995510
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &76566640 !ruby/object:Gem::Requirement
+  requirement: &73994640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *76566640
+  version_requirements: *73994640
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &76565790 !ruby/object:Gem::Requirement
+  requirement: &73993470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76565790
+  version_requirements: *73993470
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &76564780 !ruby/object:Gem::Requirement
+  requirement: &73992940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *76564780
+  version_requirements: *73992940
 - !ruby/object:Gem::Dependency
   name: avatars_for_rails
-  requirement: &76564050 !ruby/object:Gem::Requirement
+  requirement: &73992090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76564050
+  version_requirements: *73992090
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &76562900 !ruby/object:Gem::Requirement
+  requirement: &73991590 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *76562900
+  version_requirements: *73991590
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &76562250 !ruby/object:Gem::Requirement
+  requirement: &73991050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 1.6.4
   type: :runtime
   prerelease: false
-  version_requirements: *76562250
+  version_requirements: *73991050
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &76561610 !ruby/object:Gem::Requirement
+  requirement: &73990470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *76561610
+  version_requirements: *73990470
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &76561160 !ruby/object:Gem::Requirement
+  requirement: &73987100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *76561160
+  version_requirements: *73987100
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &76560710 !ruby/object:Gem::Requirement
+  requirement: &73986560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,10 +143,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *76560710
+  version_requirements: *73986560
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &76559970 !ruby/object:Gem::Requirement
+  requirement: &73986050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *76559970
+  version_requirements: *73986050
 - !ruby/object:Gem::Dependency
   name: mailboxer
-  requirement: &76559650 !ruby/object:Gem::Requirement
+  requirement: &73985530 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *76559650
+  version_requirements: *73985530
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &76558950 !ruby/object:Gem::Requirement
+  requirement: &73985000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,10 +176,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76558950
+  version_requirements: *73985000
 - !ruby/object:Gem::Dependency
   name: formtastic
-  requirement: &76558000 !ruby/object:Gem::Requirement
+  requirement: &73984580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -187,10 +187,10 @@ dependencies:
         version: 1.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *76558000
+  version_requirements: *73984580
 - !ruby/object:Gem::Dependency
   name: simple-navigation
-  requirement: &76557140 !ruby/object:Gem::Requirement
+  requirement: &73984140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -198,10 +198,10 @@ dependencies:
         version: 3.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *76557140
+  version_requirements: *73984140
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &76556750 !ruby/object:Gem::Requirement
+  requirement: &73983710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -209,10 +209,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *76556750
+  version_requirements: *73983710
 - !ruby/object:Gem::Dependency
   name: modernizr-rails
-  requirement: &76556100 !ruby/object:Gem::Requirement
+  requirement: &73983050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -220,10 +220,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *76556100
+  version_requirements: *73983050
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  requirement: &76554490 !ruby/object:Gem::Requirement
+  requirement: &73982570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -231,10 +231,10 @@ dependencies:
         version: 2.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *76554490
+  version_requirements: *73982570
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &76551540 !ruby/object:Gem::Requirement
+  requirement: &73981710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -242,10 +242,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76551540
+  version_requirements: *73981710
 - !ruby/object:Gem::Dependency
   name: rails_autolink
-  requirement: &76550070 !ruby/object:Gem::Requirement
+  requirement: &73980800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -253,10 +253,10 @@ dependencies:
         version: 1.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *76550070
+  version_requirements: *73980800
 - !ruby/object:Gem::Dependency
   name: social_cheesecake
-  requirement: &76547020 !ruby/object:Gem::Requirement
+  requirement: &73979930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -264,10 +264,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *76547020
+  version_requirements: *73979930
 - !ruby/object:Gem::Dependency
   name: i18n-js
-  requirement: &76544820 !ruby/object:Gem::Requirement
+  requirement: &73979430 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -275,10 +275,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *76544820
+  version_requirements: *73979430
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &76542470 !ruby/object:Gem::Requirement
+  requirement: &73975840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -286,10 +286,10 @@ dependencies:
         version: 0.3.9
   type: :development
   prerelease: false
-  version_requirements: *76542470
+  version_requirements: *73975840
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &76540830 !ruby/object:Gem::Requirement
+  requirement: &73975480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -297,10 +297,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76540830
+  version_requirements: *73975480
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &76538610 !ruby/object:Gem::Requirement
+  requirement: &73975030 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -308,10 +308,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *76538610
+  version_requirements: *73975030
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &76537000 !ruby/object:Gem::Requirement
+  requirement: &73974540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -319,10 +319,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *76537000
+  version_requirements: *73974540
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &76528490 !ruby/object:Gem::Requirement
+  requirement: &73974160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -330,10 +330,10 @@ dependencies:
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *76528490
+  version_requirements: *73974160
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &76527450 !ruby/object:Gem::Requirement
+  requirement: &73973800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -341,10 +341,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *76527450
+  version_requirements: *73973800
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &76526190 !ruby/object:Gem::Requirement
+  requirement: &73973410 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -352,10 +352,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *76526190
+  version_requirements: *73973410
 - !ruby/object:Gem::Dependency
   name: nifty-generators
-  requirement: &76525210 !ruby/object:Gem::Requirement
+  requirement: &73972990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -363,7 +363,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *76525210
+  version_requirements: *73972990
 description: ! 'Social Stream is a Ruby on Rails engine providing your application
   with social networking features and activity streams.
 
@@ -565,7 +565,7 @@ files:
 - app/assets/javascripts/toolbar.js
 - app/assets/javascripts/users.js
 - app/assets/stylesheets/_colors.scss
-- app/assets/stylesheets/activities.css.scss
+- app/assets/stylesheets/activities.css.scss.erb
 - app/assets/stylesheets/base.css.scss
 - app/assets/stylesheets/cheesecake.css.scss
 - app/assets/stylesheets/contacts.css.scss
@@ -1012,7 +1012,7 @@ files:
 - vendor/assets/javascripts/jquery.tipsy.js
 - vendor/assets/javascripts/jquery.validate.js
 - vendor/assets/javascripts/jquery.validate.old.js
-- vendor/assets/javascripts/jquery.watermarkinput.js
+- vendor/assets/javascripts/jquery.watermark.js
 - vendor/assets/javascripts/superfish.js
 - vendor/assets/stylesheets/carousel.css
 - vendor/assets/stylesheets/chosen-sprite.png

data/vendor/assets/javascripts/jquery.watermarkinput.js

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2007 Josh Bush (digitalbush.com)
- * 
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use,
- * copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following
- * conditions:
-
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- * OTHER DEALINGS IN THE SOFTWARE. 
- */
- 
-/*
- * Version: Beta 1
- * Release: 2007-06-01
- */ 
-(function($) {
-	var map=new Array();
-	$.Watermark = {
-		ShowAll:function(){
-			for (var i=0;i<map.length;i++){
-				if(map[i].obj.val()==""){
-					map[i].obj.val(map[i].text);					
-					map[i].obj.css("color",map[i].WatermarkColor);
-				}else{
-				    map[i].obj.css("color",map[i].DefaultColor);
-				}
-			}
-		},
-		HideAll:function(){
-			for (var i=0;i<map.length;i++){
-				if(map[i].obj.val()==map[i].text)
-					map[i].obj.val("");					
-			}
-		}
-	}
-	
-	$.fn.Watermark = function(text,color) {
-		if(!color)
-			color="#aaa";
-		return this.each(
-			function(){		
-				var input=$(this);
-				var defaultColor=input.css("color");
-				map[map.length]={text:text,obj:input,DefaultColor:defaultColor,WatermarkColor:color};
-				function clearMessage(){
-					if(input.val()==text)
-						input.val("");
-					input.css("color",defaultColor);
-				}
-
-				function insertMessage(){
-					if(input.val().length==0 || input.val()==text){
-						input.val(text);
-						input.css("color",color);	
-					}else
-						input.css("color",defaultColor);				
-				}
-
-				input.focus(clearMessage);
-				input.blur(insertMessage);								
-				input.change(insertMessage);
-				
-				insertMessage();
-			}
-		);
-	};
-})(jQuery);