[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121001145308-ri5rp2cazxqxcxme

2 files changed, 149 insertions, 155 deletions

diff --git a/addons/web/static/lib/jquery.textext/jquery.textext.css b/addons/web/static/lib/jquery.textext/jquery.textext.css
new file mode 100644
index 00000000000..f180ee66184
--- /dev/null
+++ b/addons/web/static/lib/jquery.textext/jquery.textext.css
@@ -0,0 +1,148 @@
+
+.text-core {
+  position: relative;
+}
+.text-core .text-wrap {
+  background: #fff;
+  position: absolute;
+}
+.text-core .text-wrap textarea, .text-core .text-wrap input {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  outline: none;
+  resize: none;
+  position: absolute;
+  background: none;
+  overflow: hidden;
+  margin: 0;
+  padding: 3px 5px 4px 5px;
+  white-space: nowrap;
+  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
+  line-height: 13px;
+  height: auto;
+}
+.text-core .text-wrap .text-arrow {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 22px;
+  height: 22px;
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAOAQMAAADHWqTrAAAAA3NCSVQICAjb4U/gAAAABlBMVEX///8yXJnt8Ns4AAAACXBIWXMAAAsSAAALEgHS3X78AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1MzmNZGAwAAABpJREFUCJljYEAF/xsY6hkY7BgYZBgYOFBkADkdAmFDagYFAAAAAElFTkSuQmCC") 50% 50% no-repeat;
+  cursor: pointer;
+  z-index: 2;
+}
+.text-core .text-wrap .text-dropdown {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  padding: 0;
+  position: absolute;
+  z-index: 3;
+  background: #fff;
+  border: 1px solid #9daccc;
+  width: 100%;
+  max-height: 100px;
+  padding: 1px;
+  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
+  display: none;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+.text-core .text-wrap .text-dropdown.text-position-below {
+  margin-top: 1px;
+}
+.text-core .text-wrap .text-dropdown.text-position-above {
+  margin-bottom: 1px;
+}
+.text-core .text-wrap .text-dropdown .text-list .text-suggestion {
+  padding: 3px 5px;
+  cursor: pointer;
+}
+.text-core .text-wrap .text-dropdown .text-list .text-suggestion.text-selected {
+  color: #fff;
+  background: #6d84b4;
+}
+.text-core .text-wrap .text-focus {
+  -webkit-box-shadow: 0px 0px 6px #6d84b4;
+  -moz-box-shadow: 0px 0px 6px #6d84b4;
+  box-shadow: 0px 0px 6px #6d84b4;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  display: none;
+}
+.text-core .text-wrap .text-focus.text-show-focus {
+  display: block;
+}
+.text-core .text-wrap .text-prompt {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  margin: 1px 0 0 2px;
+  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
+  color: #c0c0c0;
+  overflow: hidden;
+  white-space: pre;
+}
+.text-core .text-wrap .text-prompt.text-hide-prompt {
+  display: none;
+}
+.text-core .text-wrap .text-tags {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  padding: 3px 35px 3px 3px;
+  cursor: text;
+}
+.text-core .text-wrap .text-tags.text-tags-on-top {
+  z-index: 2;
+}
+.text-core .text-wrap .text-tags .text-tag {
+  float: left;
+}
+.text-core .text-wrap .text-tags .text-tag .text-button {
+  -webkit-border-radius: 2px;
+  -moz-border-radius: 2px;
+  border-radius: 2px;
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  position: relative;
+  float: left;
+  border: 1px solid #9daccc;
+  background: #e2e6f0;
+  color: #000;
+  padding: 0px 17px 0px 3px;
+  margin: 0 2px 2px 0;
+  cursor: pointer;
+  height: 16px;
+  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;
+}
+.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove {
+  position: absolute;
+  right: 3px;
+  top: 2px;
+  display: block;
+  width: 11px;
+  height: 11px;
+  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAhCAYAAAAPm1F2AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAB50RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNS4xqx9I6wAAAQ5JREFUOI2dlD0WwiAQhCc8L6HHgAPoASwtSYvX8BrQxtIyveYA8RppLO1jE+LwE8lzms2yH8MCj1QoaBzH+VuUYNYMS213UlvDRamtUbXb5ZyPHuDoxwGgip3ipfvGuGzPz+vZ/coDONdzFuYCO6ramQQG0DJIE1oPBBvM6e9LqaS2FwD7FWwnVoIAsOc2Xn1jDlyd8pfPBRVOBHA8cc/3yCmQqt0jcY4LuTyAF3pOYS6wI48LAm4MUrx5JthgSQJAt5LtNgAUgEMBBIC3AL2xgo58dEPfhE9wygef89FtCeC49UwltR1pQrK2qr9vNr7uRTCBF3pOYS6wI4/zdQ8MUpxPI9hgSQL0Xyio/QBt54DzsHQx6gAAAABJRU5ErkJggg==") 0 0 no-repeat;
+}
+.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove:hover {
+  background-position: 0 -11px;
+}
+.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove:active {
+  background-position: 0 -22px;
+}
diff --git a/addons/web/static/lib/jquery.textext/jquery.textext.js b/addons/web/static/lib/jquery.textext/jquery.textext.js
index 294ceea8c73..94a78b6bb7a 100644
--- a/addons/web/static/lib/jquery.textext/jquery.textext.js
+++ b/addons/web/static/lib/jquery.textext/jquery.textext.js
@@ -2465,7 +2465,7 @@
 			target = $(e.target)
 			;
 
-		if(target.is(CSS_DOT_SUGGESTION) || target.is(CSS_DOT_LABEL))
+		if($(CSS_DOT_SUGGESTION).has(target[0]) || $(CSS_DOT_LABEL).has(target[0]))
 			self.trigger('enterKeyPress');
 		
 		if (self.core().hasPlugin('tags'))
@@ -4774,157 +4774,3 @@
 		return node;
 	};
 })(jQuery);
-;(function(a){var b=document,c="getElementsByTagName",d=b[c]("head")[0]||b[c]("body")[0],e=b.createElement("style");e.innerHTML=a,d.appendChild(e)})('\n.text-core {\
-  position: relative;\
-}\
-.text-core .text-wrap {\
-  background: #fff;\
-  position: absolute;\
-}\
-.text-core .text-wrap textarea, .text-core .text-wrap input {\
-  -webkit-box-sizing: border-box;\
-  -moz-box-sizing: border-box;\
-  box-sizing: border-box;\
-  -webkit-border-radius: 0px;\
-  -moz-border-radius: 0px;\
-  border-radius: 0px;\
-  border: 1px solid #9daccc;\
-  outline: none;\
-  resize: none;\
-  position: absolute;\
-  z-index: 1;\
-  background: none;\
-  overflow: hidden;\
-  margin: 0;\
-  padding: 3px 5px 4px 5px;\
-  white-space: nowrap;\
-  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;\
-  line-height: 13px;\
-  height: auto;\
-}\
-\n.text-core .text-wrap .text-arrow {\
-  -webkit-box-sizing: border-box;\
-  -moz-box-sizing: border-box;\
-  box-sizing: border-box;\
-  position: absolute;\
-  top: 0;\
-  right: 0;\
-  width: 22px;\
-  height: 22px;\
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAOAQMAAADHWqTrAAAAA3NCSVQICAjb4U/gAAAABlBMVEX///8yXJnt8Ns4AAAACXBIWXMAAAsSAAALEgHS3X78AAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1MzmNZGAwAAABpJREFUCJljYEAF/xsY6hkY7BgYZBgYOFBkADkdAmFDagYFAAAAAElFTkSuQmCC") 50% 50% no-repeat;\
-  cursor: pointer;\
-  z-index: 2;\
-}\
-\n.text-core .text-wrap .text-dropdown {\
-  -webkit-box-sizing: border-box;\
-  -moz-box-sizing: border-box;\
-  box-sizing: border-box;\
-  padding: 0;\
-  position: absolute;\
-  z-index: 3;\
-  background: #fff;\
-  border: 1px solid #9daccc;\
-  width: 100%;\
-  max-height: 100px;\
-  padding: 1px;\
-  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;\
-  display: none;\
-  overflow-x: hidden;\
-  overflow-y: auto;\
-}\
-.text-core .text-wrap .text-dropdown.text-position-below {\
-  margin-top: 1px;\
-}\
-.text-core .text-wrap .text-dropdown.text-position-above {\
-  margin-bottom: 1px;\
-}\
-.text-core .text-wrap .text-dropdown .text-list .text-suggestion {\
-  padding: 3px 5px;\
-  cursor: pointer;\
-}\
-.text-core .text-wrap .text-dropdown .text-list .text-suggestion em {\
-  font-style: normal;\
-  text-decoration: underline;\
-}\
-.text-core .text-wrap .text-dropdown .text-list .text-suggestion.text-selected {\
-  color: #fff;\
-  background: #6d84b4;\
-}\
-\n.text-core .text-wrap .text-focus {\
-  -webkit-box-shadow: 0px 0px 6px #6d84b4;\
-  -moz-box-shadow: 0px 0px 6px #6d84b4;\
-  box-shadow: 0px 0px 6px #6d84b4;\
-  position: absolute;\
-  width: 100%;\
-  height: 100%;\
-  display: none;\
-}\
-.text-core .text-wrap .text-focus.text-show-focus {\
-  display: block;\
-}\
-\n.text-core .text-wrap .text-prompt {\
-  -webkit-box-sizing: border-box;\
-  -moz-box-sizing: border-box;\
-  box-sizing: border-box;\
-  position: absolute;\
-  width: 100%;\
-  height: 100%;\
-  margin: 1px 0 0 2px;\
-  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;\
-  color: #c0c0c0;\
-  overflow: hidden;\
-  white-space: pre;\
-}\
-.text-core .text-wrap .text-prompt.text-hide-prompt {\
-  display: none;\
-}\
-\n.text-core .text-wrap .text-tags {\
-  -webkit-box-sizing: border-box;\
-  -moz-box-sizing: border-box;\
-  box-sizing: border-box;\
-  position: absolute;\
-  width: 100%;\
-  height: 100%;\
-  padding: 3px 35px 3px 3px;\
-  cursor: text;\
-}\
-.text-core .text-wrap .text-tags.text-tags-on-top {\
-  z-index: 2;\
-}\
-.text-core .text-wrap .text-tags .text-tag {\
-  float: left;\
-}\
-.text-core .text-wrap .text-tags .text-tag .text-button {\
-  -webkit-border-radius: 2px;\
-  -moz-border-radius: 2px;\
-  border-radius: 2px;\
-  -webkit-box-sizing: border-box;\
-  -moz-box-sizing: border-box;\
-  box-sizing: border-box;\
-  position: relative;\
-  float: left;\
-  border: 1px solid #9daccc;\
-  background: #e2e6f0;\
-  color: #000;\
-  padding: 0px 17px 0px 3px;\
-  margin: 0 2px 2px 0;\
-  cursor: pointer;\
-  height: 16px;\
-  font: 11px "lucida grande", tahoma, verdana, arial, sans-serif;\
-}\
-.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove {\
-  position: absolute;\
-  right: 3px;\
-  top: 2px;\
-  display: block;\
-  width: 11px;\
-  height: 11px;\
-  background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAsAAAAhCAYAAAAPm1F2AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEgAACxIB0t1+/AAAAB50RVh0U29mdHdhcmUAQWRvYmUgRmlyZXdvcmtzIENTNS4xqx9I6wAAAQ5JREFUOI2dlD0WwiAQhCc8L6HHgAPoASwtSYvX8BrQxtIyveYA8RppLO1jE+LwE8lzms2yH8MCj1QoaBzH+VuUYNYMS213UlvDRamtUbXb5ZyPHuDoxwGgip3ipfvGuGzPz+vZ/coDONdzFuYCO6ramQQG0DJIE1oPBBvM6e9LqaS2FwD7FWwnVoIAsOc2Xn1jDlyd8pfPBRVOBHA8cc/3yCmQqt0jcY4LuTyAF3pOYS6wI48LAm4MUrx5JthgSQJAt5LtNgAUgEMBBIC3AL2xgo58dEPfhE9wygef89FtCeC49UwltR1pQrK2qr9vNr7uRTCBF3pOYS6wI4/zdQ8MUpxPI9hgSQL0Xyio/QBt54DzsHQx6gAAAABJRU5ErkJggg==") 0 0 no-repeat;\
-}\
-.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove:hover {\
-  background-position: 0 -11px;\
-}\
-.text-core .text-wrap .text-tags .text-tag .text-button a.text-remove:active {\
-  background-position: 0 -22px;\
-}\
-');
\ No newline at end of file