修改配置项

fex-team · Mar 18, 2014 · 4aca3e9 · 4aca3e9
1 parent ebf8ae8
commit 4aca3e9
Show file tree

Hide file tree

Showing 13 changed files with 19,145 additions and 6 deletions.
diff --git a/_src/core/finder.js b/_src/core/finder.js
@@ -53,6 +53,6 @@ var Finder = UF.Finder = UF.createClass('Finder', {
         return lang;
     },
     getRealPath: function (path) {
-        return this.serverOption.realRootUrl + path;
+        return (this.serverOption.realRootUrl + path).replace('//', '/');
     }
 });
diff --git a/_src/modules/upload.js b/_src/modules/upload.js
@@ -43,9 +43,9 @@ UF.registerModule("uploadmodule", function () {
 
         },
         "defaultOptions": {
-//            'uploaderFileName': 'file',
-//            'uploaderSwfUrl': uf.getOption('URL') + '/lib/webuploader/dist/Uploader.swf',
-//            'uploaderJsUrl': uf.getOption('URL') + '/lib/webuploader/dist/webuploader.js'
+            'uploaderFileName': 'file',
+            'uploaderSwfUrl': uf.getOption('URL') + '/lib/webuploader/Uploader.swf',
+            'uploaderJsUrl': uf.getOption('URL') + '/lib/webuploader/webuploader.js'
         },
         "commands": {
             "upload": {

diff --git a/lib/webuploader/Uploader.swf b/lib/webuploader/Uploader.swf
diff --git a/lib/webuploader/webuploader.css b/lib/webuploader/webuploader.css
@@ -0,0 +1,30 @@
+.webuploader-pick {
+	position: relative;
+	display: inline-block;
+	cursor: pointer;
+	background: #00b7ee;
+	padding: 10px 15px;
+	color: #fff;
+	text-align: center;
+	border-radius: 3px;
+	overflow: hidden;
+}
+.webuploader-pick-hover {
+	background: #00a2d4;
+}
+
+.webuploader-pick-disable {
+	opacity: 0.6;
+	pointer-events:none;
+}
+
+.webuploader-dnd {
+	width: 400px;
+	height: 400px;
+	border: 3px solid #ddd;
+}
+
+.webuploader-dnd-over {
+	border-style: dashed;
+}
+