From 1bc052b62121cfbdd19d783b72ffae3fc9bfad88 Mon Sep 17 00:00:00 2001
From: tnantoka <bornneet@livedoor.com>
Date: Wed, 2 Sep 2009 00:01:21 +0900
Subject: [PATCH] =?utf8?q?=E5=85=AC=E9=96=8B=E6=BA=96=E5=82=99=E5=AE=8C?=
 =?utf8?q?=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 jquery.tagget.js | 69 +++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 48 insertions(+), 21 deletions(-)

diff --git a/jquery.tagget.js b/jquery.tagget.js
index 2c12682..7a21aae 100644
--- a/jquery.tagget.js
+++ b/jquery.tagget.js
@@ -349,13 +349,18 @@
 		
 		},
 
+		getToolbar: function(t) {
+		
+			return $(t).parents('.tagget_wrapper').children('.tagget_toolbar');
+		
+		},
 
 		// wrap要素にeventを設定する。
 		// 既にHTMLがあった場合は、こちらだけを行う。
 		relate: function(t) {
 		
-			var toolbar = $(t).parents('.tagget_wrapper').children('.tagget_toolbar');
-
+			var toolbar = this.getToolbar(t);
+			
 			// 選択範囲変換
 			// onchangeイベント設定
 			toolbar.find('.tagget_encode select').change(function() {
@@ -452,6 +457,13 @@
 			return (new RegExp(currentType)).test(type);
 		},
 
+		
+		checkCookie: function(t) {
+			var cookie = $(t).parents('.tagget_wrapper')
+				.find('.tagget_cookie input').attr('checked');
+			return cookie;
+		},
+
 		checkIntelli: function(t) {
 			var intelli = $(t).parents('.tagget_wrapper')
 				.find('.tagget_intelli input').attr('checked');
@@ -993,7 +1005,26 @@
 				top: top
 			};
 			
+		}, 
+		
+		fillZero: function(s) {
+		    return ('0' + s).slice(-2); 
+		}, 
+		
+		now: function() {
+		
+				var date = new Date();
+				var y = date.getFullYear();
+				var m = this.fillZero(date.getMonth() + 1);
+				var d = this.fillZero(date.getDate());
+				var h = this.fillZero(date.getHours());
+				var min = this.fillZero(date.getMinutes());
+				var sec = this.fillZero(date.getSeconds());
+
+				return y + '/' + m + '/' + d + '/' + ' ' + h + ':' + min + ':' + sec;
+
 		}
+		
 	};
 
     /* ---------- ---------- ---------- ---------- ---------- ---------- ---------- ---------- */
@@ -1090,7 +1121,8 @@
 			if (e.shiftKey && e.which == 13) {
 
 				var n = '\n';
-				if (!Wrapper.isPopup(t) && Wrapper.checkType(t, 'html')) {
+//				if (!Wrapper.isPopup(t) && Wrapper.checkType(t, 'html')) {
+				if (Wrapper.checkType(t, 'html')) {
 					n = '<br />';
 				}
 				Cursor.insert(t, n);
@@ -1101,9 +1133,13 @@
 			// Ctrl+Enterで閉じタグ補完
 			if (e.ctrlKey && e.which == 13) {
 
-				Cursor.closeTag(t);
+				if (Wrapper.checkType(t, 'html')) {
+
+					Cursor.closeTag(t);
+					return false;
+
+				}
 			
-				return false;
 			}
 
 			// 十字キーで候補選択
@@ -1210,28 +1246,19 @@
 
 			self.each(function() {
 
-				Cookie.save(Wrapper.getId(this), Cookie.zip(this.value));
+				if (Wrapper.checkCookie(this)) {
 
-				var fillZero = function(s) {
-				    return ('0' + s).slice(-2); 
-				};
-				var status = Wrapper.getStatus(this);	
-				var date = new Date();
-				var y = date.getFullYear();
-				var m = fillZero(date.getMonth() + 1);
-				var d = fillZero(date.getDate());
-				var h = fillZero(date.getHours());
-				var min = fillZero(date.getMinutes());
-				var sec = fillZero(date.getSeconds());
-				status.children('.tagget_time')
-					.html('Draft Saved At ' + 
-						y + '/' + m + '/' + d + '/' + ' ' + h + ':' + min + ':' + sec);
+					Cookie.save(Wrapper.getId(this), Cookie.zip(this.value));
+
+					var status = Wrapper.getStatus(this);	
+					status.children('.tagget_time').html('Draft Saved At ' + Util.now());
+
+				}
 				
 				setTimeout(timer, interval);
 			});		
 		}, interval);
 			
-			
 		// This is jQuery!!
 		return this;
 		
-- 
2.11.0