变基master 到 develop

protected/controller/SProjectController.php

@@ -594,7 +594,6 @@ class SProjectController extends DooController
     {
         return strtolower(trim(substr(strrchr($filename, '.'), 1, 10)));
     }
-
 }
 
 ?>

protected/view/r-project-section-files-recover.html

@@ -321,7 +321,6 @@
             var iaid = $(this).attr('iaid');
             window.location.href = "{{rootUrl}}rproject/section/get/" + iaid + "/attachment";
         });
-
     });
 </script>
 </body>

protected/view/s-project-section-files-recover.html

@@ -311,7 +311,6 @@
                 }
             });
         });
-
         $("a[id^='down_']").click(function () {
             var iaid = $(this).attr('iaid');
             window.location.href = "{{rootUrl}}sproject/section/get/" + iaid + "/attachment";

protected/view/s-project-section-files.html

@@ -412,6 +412,7 @@
                 var nowurl = localurl.replace(/\/num\/\d+/,'');
                 window.location.href = nowurl;
             }
+
         });
 
         $("#uploaduser").change(function () {