Merge branch 'release_1.3_20160104' of http://192.168.3.17/gitlab/zhanghongbo/qfw into release_1.3_20160104

core/src/web/staticres/css/swordfish.css

@@ -216,7 +216,7 @@ a:focus, a:hover{
 .swordfish-right{
 	padding-right: 0px;
 	background-color: #FFFFFF;
-	max-width: 250px;
+	width: 250px;
 	display: inline-block;
 	vertical-align: top;
 	float: right;

core/src/web/staticres/wxrssset/main.js

@@ -83,6 +83,9 @@ KeyWordDialog.AppendNode = function(dialogObj,value){
 			$(this).children("lable").children("font").text(i+1);
 		});
 	});
+	if(typeof(value) == "undefined" || value == ""){
+		obj.find("[type='text']").focus()
+	}
 }
 //信息范围
 function ScopeDialog(type,clickLi){

core/src/web/templates/swordfish/rssset.html

@@ -377,6 +377,9 @@ function appendKeyWord(type,value){
 		autoChecked(type,false);
 		ajaxReq();
 	});
+	if(typeof(value) == "undefined" || value == ""){
+		node.children("[type='text']").focus()
+	}
 	autoChecked(type,false);
 }
 function ajaxReq(){