Merge branch 'master' into selectmenu

1 files changed, 2 insertions, 16 deletions

diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js
index 823934e05..9f480bf38 100644
--- a/ui/jquery.ui.datepicker.js
+++ b/ui/jquery.ui.datepicker.js
@@ -13,7 +13,6 @@
  */
 (function( $, undefined ) {
 
-/*jshint evil: true */
 $.extend($.ui, { datepicker: { version: "@VERSION" } });
 
 var PROP_NAME = 'datepicker',
@@ -139,20 +138,7 @@ $.extend(Datepicker.prototype, {
 	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
 	 */
 	_attachDatepicker: function(target, settings) {
-		// check for settings on the control itself - in namespace 'date:'
-		var attrName, attrValue, nodeName, inline, inst,
-			inlineSettings = null;
-		for (attrName in this._defaults) {
-			attrValue = target.getAttribute('date:' + attrName);
-			if (attrValue) {
-				inlineSettings = inlineSettings || {};
-				try {
-					inlineSettings[attrName] = eval(attrValue);
-				} catch (err) {
-					inlineSettings[attrName] = attrValue;
-				}
-			}
-		}
+		var nodeName, inline, inst;
 		nodeName = target.nodeName.toLowerCase();
 		inline = (nodeName === 'div' || nodeName === 'span');
 		if (!target.id) {
@@ -160,7 +146,7 @@ $.extend(Datepicker.prototype, {
 			target.id = 'dp' + this.uuid;
 		}
 		inst = this._newInst($(target), inline);
-		inst.settings = $.extend({}, settings || {}, inlineSettings || {});
+		inst.settings = $.extend({}, settings || {});
 		if (nodeName === 'input') {
 			this._connectDatepicker(target, inst);
 		} else if (inline) {