whowish_word 0.1.6 → 0.1.7

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_element_creator.js

@@ -1,82 +1,58 @@
-var WhowishWordElementCreator = WhowishWordCreator.extend({
-  
-	makeEditIcon: function(){
-		
-		var attrs = this.getRelevantAttributes();
-		
-		for (var i=0;i<attrs.length;i++) {
-			
-			var editIcon = document.createElement('span');
-			$w(editIcon).addClass('whowishWordEditIcon');
-			$w(editIcon).attr('id', this.getEditIconId(attrs[i]));
-			$w(editIcon).attr('title', attrs[i]);
-			
-			var whowishWordIdPackage = whowishWordHelper.extractWhowishWordIdFromText($w(this.element).attr(attrs[i]));
-			var idPackage = whowishWordHelper.parseWhowishWordIdPackage(whowishWordIdPackage);
-			
-			editIcon.whowishWord = {};
-			editIcon.whowishWord.contentHandler = new WhowishWordAttributeHandler(this.element, attrs[i]);
-			
-			editIcon.whowishWord.id = idPackage.id;
-			editIcon.whowishWord.variables = idPackage.variables;
-			editIcon.whowishWord.attributeName = attrs[i];
-			
-			this.addEditIcon(editIcon);
-		}
-		
-	},
-  
-  
-	sanitize: function(){
-		
-		var attrs = this.getRelevantAttributes();
-		
-		for (var i=0;i<attrs.length;i++) {
-			
-			var newValue = $w(this.element).attr(attrs[i]).replace(whowishWordVariables.attributeValuePattern,"$2");
-			
-			try {
-				this.element[attrs[i]] = newValue;
-			} catch(e) {}
-			
-			try {
-				this.element.attributes[attrs[i]].value = newValue;
-			} catch (e) {}
-			
-			$w(this.element).attr(attrs[i], newValue);
-			
-		}
-	
-	},
-	
-	getEditIconId: function(attributeName) {
-	
-		return this.element.id + 
-				whowishWordVariables.separator + 
-				attributeName;
-	},
-	
-
-	
-	getRelevantAttributes: function() {
-	
-		var attrs = [];
-		
-		for (var i = 0; i < this.element.attributes.length; i++) {
-			
-			if (this.element.attributes[i].name.toLowerCase() == "id") continue;
-			if (this.element.attributes[i].name.toLowerCase() == "value") continue;
-			
-			if (this.element.attributes[i].value.match(whowishWordVariables.attributeValuePattern) != null) {
-				attrs.push(this.element.attributes[i].name);
-			}
-		  
-		}
-		
-		return attrs;
-		
-	}
-
-
-  
+var WhowishWordElementCreator = WhowishWordCreator.extend({
+  
+	makeEditIcon: function(){
+		
+		this.attrs = WhowishWordElementGuard.getRelevantAttributes(this.element);
+		var attrs = this.attrs;
+		
+		for (var i=0;i<attrs.length;i++) {
+			
+			var editIcon = document.createElement('span');
+			$w(editIcon).addClass('whowishWordEditIcon');
+			$w(editIcon).attr('id', whowishWordHelper.makeEditIconId(this.element, attrs[i]));
+			$w(editIcon).attr('title', attrs[i]);
+			
+			var whowishWordIdPackage = whowishWordHelper.extractWhowishWordIdFromText($w(this.element).attr(attrs[i]));
+			var idPackage = whowishWordHelper.parseWhowishWordIdPackage(whowishWordIdPackage);
+			
+					
+			customData = {};
+			customData.contentHandler = new WhowishWordAttributeHandler(this.element, attrs[i]);
+			
+			customData.id = idPackage.id;
+			customData.variables = idPackage.variables;
+			customData.attributeName = attrs[i];
+			
+			whowishWordStorage[editIcon.id] = customData;
+			
+			this.addEditIcon(editIcon);
+		}
+		
+	},
+  
+  
+	sanitize: function(){
+		
+		var attrs = this.attrs;
+		
+		for (var i=0;i<attrs.length;i++) {
+			
+			var newValue = whowishWordHelper.sanitize($w(this.element).attr(attrs[i]));
+			
+			try {
+				this.element[attrs[i]] = newValue;
+			} catch(e) {}
+			
+			try {
+				this.element.attributes[attrs[i]].value = newValue;
+			} catch (e) {}
+			
+			$w(this.element).attr(attrs[i], newValue);
+			
+		}
+	
+	},
+
+
+  
 });

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_element_guard.js

@@ -0,0 +1,32 @@
+var WhowishWordElementGuard = {
+
+	check: function(element){
+		return (this.getRelevantAttributes(element).length > 0)
+	},
+	
+	getRelevantAttributes: function(element) {
+	
+		var attrs = [];
+		
+		for (var i = 0; i < element.attributes.length; i++) {
+			
+			var attr_name = element.attributes[i].name.toLowerCase();
+			
+			if (attr_name == "id") continue;
+			if (attr_name == "value") continue;
+			if ($w('#' + whowishWordHelper.makeEditIconId(element, attr_name)).length > 0) continue;
+			
+			var value = element.attributes[i].value;
+			
+			if (typeof(value).toLowerCase() != "string") continue;
+			
+			if (whowishWordHelper.match(value)) {
+				attrs.push(element.attributes[i].name);
+			}
+		  
+		}
+		
+		return attrs;
+		
+	}
+};

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_html_creator.js

@@ -1,19 +1,19 @@
-var WhowishWordHtmlCreator = WhowishWordCommonCreator.extend({
-	
-	identity: function() {
-		return 'html';
-	},
-	
-	getContent: function() {
-		return $w(this.element).html();
-	},
-	
-	setContent: function(content) {
-		$w(this.element).html(content);
-	},
-	
-	instantiateAndGetContentHandler: function() {
-		return new WhowishWordHtmlHandler(this.element);
-	}
-  
+var WhowishWordHtmlCreator = WhowishWordCommonCreator.extend({
+	
+	identity: function() {
+		return 'html';
+	},
+	
+	getContent: function() {
+		return $w(this.element).html();
+	},
+	
+	setContent: function(content) {
+		$w(this.element).html(content);
+	},
+	
+	instantiateAndGetContentHandler: function() {
+		return new WhowishWordHtmlHandler(this.element);
+	}
+  
 });

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_html_guard.js

@@ -0,0 +1,12 @@
+var WhowishWordHtmlGuard = {
+	
+	check: function(element) {
+		return (element.tagName.toLowerCase() == "dfn"
+				|| element.tagName.toLowerCase() == "button"
+				|| element.tagName.toLowerCase() == "label")
+				&& (typeof(html = $w(element).html())).toLowerCase() == "string"
+				&& whowishWordHelper.match(html)
+				&& ($w('#' + whowishWordHelper.makeEditIconId(element, 'html')).length == 0);
+	}
+  
+};

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_select_creator.js

@@ -1,11 +1,11 @@
-var WhowishWordSelectCreator = WhowishWordCreator.extend({
-	
-  makeEditIcon: function() {
-
-  },
-  
-  sanitize: function() {
-
-  }
-  
+var WhowishWordSelectCreator = WhowishWordCreator.extend({
+	
+  makeEditIcon: function() {
+
+  },
+  
+  sanitize: function() {
+
+  }
+  
 });

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_text_creator.js

@@ -1,20 +1,20 @@
-var WhowishWordTextCreator = WhowishWordCommonCreator.extend({
-	
-	identity: function() {
-		return 'text';
-	},
-	
-	getContent: function() {
-		return $w(this.element).text();
-	},
-	
-	setContent: function(content) {
-		$w(this.element).text(content);
-	},
-	
-	instantiateAndGetContentHandler: function() {
-		return new WhowishWordTextHandler(this.element);
-	}
-
-  
+var WhowishWordTextCreator = WhowishWordCommonCreator.extend({
+	
+	identity: function() {
+		return 'text';
+	},
+	
+	getContent: function() {
+		return $w(this.element).text();
+	},
+	
+	setContent: function(content) {
+		$w(this.element).text(content);
+	},
+	
+	instantiateAndGetContentHandler: function() {
+		return new WhowishWordTextHandler(this.element);
+	}
+
+  
 });

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_text_guard.js

@@ -0,0 +1,10 @@
+var WhowishWordTextGuard = {
+	
+	check: function(element) {
+		return element.tagName.toLowerCase() == "option" 
+				&& (typeof(text = $w(element).text())).toLowerCase() == "string"
+				&& whowishWordHelper.match(text)
+				&& ($w('#' + whowishWordHelper.makeEditIconId(element, 'text')).length == 0);
+	}
+  
+};

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_value_creator.js

@@ -1,20 +1,20 @@
-var WhowishWordValueCreator = WhowishWordCommonCreator.extend({
-	
-	identity: function() {
-		return 'value';
-	},
-	
-	getContent: function() {
-		return $w(this.element).val();
-	},
-	
-	setContent: function(content) {
-		$w(this.element).val(content);
-	},
-	
-	instantiateAndGetContentHandler: function() {
-		return new WhowishWordValueHandler(this.element);
-	}
-
-  
+var WhowishWordValueCreator = WhowishWordCommonCreator.extend({
+	
+	identity: function() {
+		return 'value';
+	},
+	
+	getContent: function() {
+		return $w(this.element).val();
+	},
+	
+	setContent: function(content) {
+		$w(this.element).val(content);
+	},
+	
+	instantiateAndGetContentHandler: function() {
+		return new WhowishWordValueHandler(this.element);
+	}
+
+  
 });

data/lib/whowish_word/rails/public/javascripts/6_whowish_word_value_guard_and_sanitizer.js

@@ -0,0 +1,24 @@
+var WhowishWordValueGuardAndSanitizer = {
+	
+	check: function(element) {
+		
+		var val;
+		
+		if (element.tagName.toLowerCase() != "select"
+			&& (typeof(val = $w(element).val())).toLowerCase() == "string"
+			&& whowishWordHelper.match(val)) {
+			
+			if ($w('#'+whowishWordHelper.makeEditIconId(element, "value")).length == 0) {
+				return true;
+			} else {
+				$w(element).val(whowishWordHelper.sanitize(val));
+			}
+			
+		}
+		
+		return false;
+				
+	}
+
+  
+};

data/lib/whowish_word/rails/public/javascripts/7_whowish_word_attribute_handler.js

@@ -1,25 +1,25 @@
-var WhowishWordAttributeHandler = WhowishWordContentHandler.extend({
-	
-  init: function(elem,attributeName){
-    this.element = elem;
-	this.attributeName = attributeName;
-  },
-  
-  setContent: function(content){
-  	
-	try {
-		this.element[this.attributeName] = content;
-	} catch(e) {}
-	
-	try {
-		this.element.attributes[this.attributeName].value = content;
-	} catch (e) {}
-	
-	$w(this.element).attr(this.attributeName, content);
-  },
-  
-  getContent: function(){
-    return $(this.element).attr(this.attributeName);
-  }
-  
+var WhowishWordAttributeHandler = WhowishWordContentHandler.extend({
+	
+  init: function(elem,attributeName){
+    this.element = elem;
+	this.attributeName = attributeName;
+  },
+  
+  setContent: function(content){
+  	
+	try {
+		this.element[this.attributeName] = content;
+	} catch(e) {}
+	
+	try {
+		this.element.attributes[this.attributeName].value = content;
+	} catch (e) {}
+	
+	$w(this.element).attr(this.attributeName, content);
+  },
+  
+  getContent: function(){
+    return $(this.element).attr(this.attributeName);
+  }
+  
 });

data/lib/whowish_word/rails/public/javascripts/7_whowish_word_html_handler.js

@@ -1,15 +1,15 @@
-var WhowishWordHtmlHandler = WhowishWordContentHandler.extend({
-	
-  init: function(elem){
-    this.element = elem;
-  },
-  
-  setContent: function(content){
-    $w(this.element).html(content);
-  },
-  
-  getContent: function(){
-    return $w(this.element).html();
-  }
-  
+var WhowishWordHtmlHandler = WhowishWordContentHandler.extend({
+	
+  init: function(elem){
+    this.element = elem;
+  },
+  
+  setContent: function(content){
+    $w(this.element).html(content);
+  },
+  
+  getContent: function(){
+    return $w(this.element).html();
+  }
+  
 });

data/lib/whowish_word/rails/public/javascripts/7_whowish_word_text_handler.js

@@ -1,15 +1,15 @@
-var WhowishWordTextHandler = WhowishWordContentHandler.extend({
-	
-  init: function(elem){
-    this.element = elem;
-  },
-  
-  setContent: function(content){
-    $w(this.element).text(content);
-  },
-  
-  getContent: function() {
-    return $w(this.element).text();
-  }
-  
+var WhowishWordTextHandler = WhowishWordContentHandler.extend({
+	
+  init: function(elem){
+    this.element = elem;
+  },
+  
+  setContent: function(content){
+    $w(this.element).text(content);
+  },
+  
+  getContent: function() {
+    return $w(this.element).text();
+  }
+  
 });

data/lib/whowish_word/rails/public/javascripts/7_whowish_word_value_handler.js

@@ -1,19 +1,25 @@
-var WhowishWordValueHandler = WhowishWordContentHandler.extend({
-	
-  init: function(elem){
-    this.element = elem;
-  },
-  
-  setContent: function(content){
-    $w(this.element).val(content);
-
-	if (this.element.attributes['value'] != undefined) {
-		this.element.attributes['value'].value = content;
-	}
-  },
-  
-  getContent: function(){
-    return $w(this.element).val();
-  }
-  
+var WhowishWordValueHandler = WhowishWordContentHandler.extend({
+	
+  init: function(elem){
+    this.element = elem;
+  },
+  
+  setContent: function(content){
+    $w(this.element).val(content);
+
+	if (this.element.attributes['value'] != undefined) {
+		this.element.attributes['value'].value = content;
+	}
+	
+	if (this.element.value != undefined) {
+		this.element.value = content;
+	}
+	
+	$w(this.element).attr('value', content);
+  },
+  
+  getContent: function(){
+    return $w(this.element).val();
+  }
+  
 });