[wip]

bzr revid: nicolas.vanhoren@openerp.com-20120507122246-q4f06v9n2et27aqp

2 files changed, 160 insertions, 193 deletions

diff --git a/addons/web/static/lib/jquery.textext/jquery.textext.css b/addons/web/static/lib/jquery.textext/jquery.textext.css
deleted file mode 100644
index e4f2dbc193a..00000000000
--- a/addons/web/static/lib/jquery.textext/jquery.textext.css
+++ /dev/null
@@ -1,186 +0,0 @@
-.text-core {
-    position: relative;
-}
-
-.text-core .text-wrap {
-    position: absolute;
-    width: 100% !important;
-}
-.text-core .text-wrap textarea {
-    resize: none !important;
-}
-
-.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;
-    outline: none;
-    resize: none;
-    position: absolute;
-    background: none;
-    overflow: hidden;
-    margin: 0;
-    padding: 3px 5px 4px 5px;
-    white-space: nowrap;
-    line-height: 13px;
-    width: 100% !important;
-}
-
-.extra_suggestions {
-    border-top: 1px solid #9daccc !important;
-}
-
-.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("/web/static/src/img/down-arrow.png") 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%;
-  padding: 1px;
-  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: #0064CD;
-}
-
-.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;
-  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;
-  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: 18px;
-}
-
-.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("remove.png") 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;
-}
-.oe_form_field_many2many span {
-   display: block;
-    width: auto;
-    margin: 0 3px 3px 0;
-    padding: 3px 8px 4px 8px;
-    position: relative;
-    float: left;
-    text-indent: 0;
-    background-color: #EEE;
-    border: 1px solid #AAA;
-    -moz-border-radius: 7px;
-    -webkit-border-radius: 7px;
-    border-radius: 7px;
-    color: #333;
-}
diff --git a/addons/web/static/lib/jquery.textext/jquery.textext.js b/addons/web/static/lib/jquery.textext/jquery.textext.js
index 2a66d33108f..294ceea8c73 100644
--- a/addons/web/static/lib/jquery.textext/jquery.textext.js
+++ b/addons/web/static/lib/jquery.textext/jquery.textext.js
@@ -1811,7 +1811,7 @@
 		var self = this;
 
 		self.baseInit(core, DEFAULT_OPTS);
-        console.log('on>>>>>', self, core, DEFAULT_OPTS);
+
 		self.on({
 			getSuggestions : self.onGetSuggestions
 		});
@@ -2375,6 +2375,7 @@
 			});
 
 			container
+				.css('maxHeight', self.opts(OPT_MAX_HEIGHT))
 				.addClass('text-position-' + self.opts(OPT_POSITION))
 				;
 
@@ -3155,9 +3156,7 @@
 		var self       = this,
 			suggestion = self.selectedSuggestionElement().data(CSS_SUGGESTION)
 			;
-        if(typeof suggestion == 'object') {
-            suggestion = suggestion['name'];
-        }
+
 		if(suggestion)
 		{
 			self.val(self.itemManager().itemToString(suggestion));
@@ -4480,8 +4479,7 @@
 
 		self.input().css({
 			paddingLeft : pos.left,
-			paddingTop  : pos.top,
-			paddingBottom: 4
+			paddingTop  : pos.top
 		});
 	};
 
@@ -4770,8 +4768,163 @@
 		var self = this,
 			node = $(self.opts(OPT_HTML_TAG))
 			;
+
 		node.find('.text-label').text(self.itemManager().itemToString(tag));
 		node.data(CSS_TAG, tag);
 		return node;
 	};
-})(jQuery);
\ No newline at end of file
+})(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