From c56e0681298bdacf243db45f2bfef80e1990cea6 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Mon, 30 Apr 2012 15:43:09 +0530
Subject: [PATCH] fix in select type field

---
 css/bootstrap/icons.css          | 2 +-
 js/legacy/widgets/form/fields.js | 2 +-
 js/wn/app.js                     | 1 -
 js/wn/ui/toolbar.min.js          | 4 +---
 js/wn/ui/toolbar/recent.js       | 3 +--
 5 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/css/bootstrap/icons.css b/css/bootstrap/icons.css
index b934190219..30294795ee 100644
--- a/css/bootstrap/icons.css
+++ b/css/bootstrap/icons.css
@@ -17,7 +17,7 @@
 }
 
 .icon-white {
-  background-image: url("./lib/images/icons/glyphicons-halflings-white.png");
+  background-image: url("../lib/images/icons/glyphicons-halflings-white.png");
 }
 
 .icon-glass {
diff --git a/js/legacy/widgets/form/fields.js b/js/legacy/widgets/form/fields.js
index 598513d060..5aad25aa3d 100644
--- a/js/legacy/widgets/form/fields.js
+++ b/js/legacy/widgets/form/fields.js
@@ -1004,7 +1004,7 @@ SelectField.prototype.make_input = function() {
 		if(this.file_attach)
 			this.set_attach_options();
 		
-		me.options_list = me.df.options?me.df.options.split('\n'):[];
+		me.options_list = me.df.options?me.df.options.split('\n'):[''];
 		
 		// add options
 		empty_select(this.input);
diff --git a/js/wn/app.js b/js/wn/app.js
index 867e0eb570..642b3e9bca 100644
--- a/js/wn/app.js
+++ b/js/wn/app.js
@@ -33,7 +33,6 @@ wn.Application = Class.extend({
 			
 		// favicon
 		this.set_favicon();
-		
 		// trigger app startup
 		$(document).trigger('startup');
 		
diff --git a/js/wn/ui/toolbar.min.js b/js/wn/ui/toolbar.min.js
index 9aec98be2e..80dd23fab0 100644
--- a/js/wn/ui/toolbar.min.js
+++ b/js/wn/ui/toolbar.min.js
@@ -27,9 +27,7 @@ wn.ui.toolbar.RecentDocs=Class.extend({init:function(){$('.navbar .nav:first').a
   </li>');this.setup();this.bind_events();},bind_events:function(){var me=this;$(document).bind('rename',function(event,dt,old_name,new_name){me.rename_notify(dt,old_name,new_name)});},rename_notify:function(dt,old,name){this.remove(dt,old);this.add(dt,name,1);},add:function(dt,dn,on_top){if(this.istable(dt))return;this.remove(dt,dn);var html=repl('<li data-docref="%(dt)s/%(dn)s">\
    <a href="#Form/%(dt)s/%(dn)s">\
     %(dn)s <span style="font-size: 10px">(%(dt)s)</span>\
-   </a></li>',{dt:dt,dn:dn});if(on_top){$('#toolbar-recent').prepend(html);}else{$('#toolbar-recent').append(html);}},istable:function(dt){return locals.DocType[dt]&&locals.DocType[dt].istable||false;},remove:function(dt,dn){$(repl('#toolbar-recent li[data-docref="%(dt)s/%(dn)s"]',{dt:dt,dn:dn})).remove();},setup:function(){try{var rlist=JSON.parse(profile.recent);}
-catch(e){return;}
-var m=rlist.length;if(m>15)m=15;for(var i=0;i<m;i++){var rd=rlist[i]
+   </a></li>',{dt:dt,dn:dn});if(on_top){$('#toolbar-recent').prepend(html);}else{$('#toolbar-recent').append(html);}},istable:function(dt){return locals.DocType[dt]&&locals.DocType[dt].istable||false;},remove:function(dt,dn){$(repl('#toolbar-recent li[data-docref="%(dt)s/%(dn)s"]',{dt:dt,dn:dn})).remove();},setup:function(){var rlist=JSON.parse(profile.recent||"[]");var m=rlist.length;if(m>15)m=15;for(var i=0;i<m;i++){var rd=rlist[i]
 if(rd[1]){var dt=rd[0];var dn=rd[1];this.add(dt,dn,0);}}}});
 /*
  *	lib/js/wn/ui/toolbar/toolbar.js
diff --git a/js/wn/ui/toolbar/recent.js b/js/wn/ui/toolbar/recent.js
index 08ce9d81ea..613790284f 100644
--- a/js/wn/ui/toolbar/recent.js
+++ b/js/wn/ui/toolbar/recent.js
@@ -65,8 +65,7 @@ wn.ui.toolbar.RecentDocs = Class.extend({
 	},
 	setup: function() {
 		// add menu items
-		try{ var rlist = JSON.parse(profile.recent); }
-		catch(e) { return; /*old style-do nothing*/ }
+		var rlist = JSON.parse(profile.recent||"[]");
 		
 		var m = rlist.length;
 		if(m>15)m=15;