From f85db46bd5101917b1fe1626c7bbb081a5442498 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Wed, 4 Feb 2026 16:24:30 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=90=88=E5=90=8C=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base-fast/pom.xml | 20 + .../controller/ContractController.java | 4 +- .../controller/FlwInstanceController.java | 2 +- .../flow/entity/ActHiProcessinfoEntity.java | 1 + .../flow/service/FlwInstanceService.java | 1 - .../service/impl/FlwInstanceServiceImpl.java | 91 +- .../price/controller/PriceController.java | 15 +- .../boge/modules/screen/ScreenController.java | 19 + .../boge/modules/screen/dto/ScreenDto.java | 34 + .../boge/modules/sys/dao/SysUserRoleDao.java | 5 +- .../sys/service/SysUserRoleService.java | 5 +- .../service/impl/SysUserRoleServiceImpl.java | 6 + base-fast/src/main/resources/application.yml | 2 +- .../src/main/resources/templates/合同.docx | Bin 33172 -> 36411 bytes base-vue/.eslintrc.js | 4 +- base-vue/src/views/common/UploadDialog.vue | 2 +- .../contract/contract-add-or-update.vue | 4 +- base-vue/src/views/modules/price/approval.vue | 8 +- .../modules/price/price-add-or-update.vue | 2 +- .../src/views/modules/tickets/approval.vue | 35 +- base-vue/src/views/modules/tickets/备用.vue | 10 +- .../third-party/video-js/video.dev.js | 4 +- .../webuploader/webuploader.flashonly.js | 1406 +++++----- .../third-party/webuploader/webuploader.js | 2298 ++++++++--------- 24 files changed, 2019 insertions(+), 1959 deletions(-) create mode 100644 base-fast/src/main/java/com/boge/modules/screen/ScreenController.java create mode 100644 base-fast/src/main/java/com/boge/modules/screen/dto/ScreenDto.java diff --git a/base-fast/pom.xml b/base-fast/pom.xml index 8616d80..65b949b 100644 --- a/base-fast/pom.xml +++ b/base-fast/pom.xml @@ -77,6 +77,26 @@ 2.2.6 + + + org.apache.pdfbox + pdfbox + 2.0.29 + + + + + com.github.librepdf + openpdf + 1.3.30 + + + + + com.twelvemonkeys.imageio + imageio-core + 3.9.4 + org.apache.poi poi diff --git a/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java b/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java index 0c5612d..33cea23 100644 --- a/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java +++ b/base-fast/src/main/java/com/boge/modules/contract/controller/ContractController.java @@ -29,6 +29,7 @@ import com.deepoove.poi.data.Tables; import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.ClassPathResource; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -198,7 +199,8 @@ public class ContractController { com.deepoove.poi.config.Configure config = com.deepoove.poi.config.Configure.builder() .bind("goods", new LoopRowTableRenderPolicy()) // 绑定rows标签使用循环行策略 .build(); - InputStream templateStream = new java.io.FileInputStream("/Users/mima0000/Desktop/合同.docx"); + ClassPathResource pathResource = new ClassPathResource("static/model/报价单样式.xls");// 根目录 + InputStream templateStream = new java.io.FileInputStream(pathResource.getPath()); XWPFTemplate template = XWPFTemplate.compile(templateStream, config).render(dataMap); // 6. 设置响应头 String fileName = "合同_" + contract.getContractCode() + ".docx"; diff --git a/base-fast/src/main/java/com/boge/modules/flow/controller/FlwInstanceController.java b/base-fast/src/main/java/com/boge/modules/flow/controller/FlwInstanceController.java index 6619d56..30d554a 100644 --- a/base-fast/src/main/java/com/boge/modules/flow/controller/FlwInstanceController.java +++ b/base-fast/src/main/java/com/boge/modules/flow/controller/FlwInstanceController.java @@ -72,7 +72,7 @@ public class FlwInstanceController { * 提交审批 */ @PostMapping("/completeFlow2") - public R completeFlow2(@RequestBody Map params){ + public R completeFlow2(@RequestBody FlowProcessParam params){ R r = instanceService.completeTaskById(params); return r; } diff --git a/base-fast/src/main/java/com/boge/modules/flow/entity/ActHiProcessinfoEntity.java b/base-fast/src/main/java/com/boge/modules/flow/entity/ActHiProcessinfoEntity.java index f578d05..4ff4f7c 100644 --- a/base-fast/src/main/java/com/boge/modules/flow/entity/ActHiProcessinfoEntity.java +++ b/base-fast/src/main/java/com/boge/modules/flow/entity/ActHiProcessinfoEntity.java @@ -43,6 +43,7 @@ public class ActHiProcessinfoEntity implements Serializable { /** * 最后更新人 */ + private Long createId; private String createName; /** * 最后更新时间 diff --git a/base-fast/src/main/java/com/boge/modules/flow/service/FlwInstanceService.java b/base-fast/src/main/java/com/boge/modules/flow/service/FlwInstanceService.java index d266453..b541404 100644 --- a/base-fast/src/main/java/com/boge/modules/flow/service/FlwInstanceService.java +++ b/base-fast/src/main/java/com/boge/modules/flow/service/FlwInstanceService.java @@ -13,7 +13,6 @@ public interface FlwInstanceService { R getTodoTaskList(Map params); - R completeTaskById(Map id); R completeTaskById(FlowProcessParam param); diff --git a/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java b/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java index 60c8c0a..df2c6d5 100644 --- a/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java +++ b/base-fast/src/main/java/com/boge/modules/flow/service/impl/FlwInstanceServiceImpl.java @@ -2,6 +2,8 @@ package com.boge.modules.flow.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.boge.common.exception.RRException; import com.boge.common.utils.Constant; @@ -19,6 +21,7 @@ import com.boge.modules.flow.service.ActHiProcessinfoService; import com.boge.modules.flow.service.FlwInstanceService; import com.boge.modules.sys.entity.SysUserEntity; import com.boge.modules.sys.service.SysRoleService; +import com.boge.modules.sys.service.SysUserRoleService; import com.boge.modules.sys.service.SysUserService; import com.boge.modules.sys.service.impl.SysUserServiceImpl; import com.boge.modules.tickets.dao.TicketsDao; @@ -68,6 +71,9 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI private SysUserServiceImpl sysUserService; @Autowired private TicketsService ticketsService; + @Autowired + private SysUserRoleService sysUserRoleService; + @Autowired private ActHiProcessinfoService actHiProcessinfoService; @Value("${ProcessInstance.defId}") @@ -93,7 +99,7 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI SysUserEntity loginUser = ShiroUtils.getUserEntity(); // 获取需要发起的流程信息 // String ticketsId = (String) params.get("ticketsId"); - Long userId = Long.valueOf((String) params.get("user1")); + Long userId = Long.valueOf((String) params.get("userId")); Map variable = new HashMap<>(); // 结合传递过来的数据动态的绑定流程变量 Set keys = params.keySet(); @@ -335,63 +341,6 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI return R.ok("操作成功").put("page", pageUtils); } - @Override - public R completeTaskById(Map params) { - String processInstance = (String) params.get("processInstance"); - Integer ticketsId = (Integer) params.get("ticketsId"); - String result = (String) params.get("result"); - String opinion = (String) params.get("opinion"); - String processName = ticketsDao.selectByProcessInstance(processInstance); - - if (StringUtils.isBlank(processInstance)) { - return R.error("流程Id不能为空"); - } - if (StringUtils.isBlank(processInstance)) { - return R.error("流程Id不能为空"); - } - Task secondTask = taskService.createTaskQuery() - .processInstanceId(processInstance) - .singleResult(); - Map secondApprovalVars = new HashMap<>(); - TicketsEntity ticketsEntity = new TicketsEntity(); - // 完结流程 - if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("完结")) { - secondApprovalVars.put("approvalResult", true); - ticketsEntity.setStatus(TicketsStatusEnums.FINISH.getCode()); - ticketsEntity.setFinishTime(new Date()); - ticketsEntity.setAssignUserId(TicketUserEnums.SPECIALIST.getCode()); - taskService.complete(secondTask.getId(), secondApprovalVars); - } - // 继续流程 - if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("同意")) { - secondApprovalVars.put("approvalResult", false); - ticketsEntity.setAssignUserId(TicketUserEnums.MANAGER.getCode()); - taskService.complete(secondTask.getId(), secondApprovalVars); - } - // 指派处理人 - if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("指派")) { - String userId = String.valueOf(params.get("userId")); - Map startVars = new HashMap<>(); - startVars.put("user1",userId); - ticketsEntity.setAssignUserId(Long.valueOf(userId)); - taskService.complete(secondTask.getId(), startVars); - } - // 继续流程 - if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("提交")) { - ticketsEntity.setAssignUserId(TicketUserEnums.SPECIALIST.getCode()); - taskService.complete(secondTask.getId(), secondApprovalVars); - } - if (StringUtils.isNotBlank(processName)&& processName.contains("完结")){ - ticketsEntity.setStatus(TicketsStatusEnums.FINISH.getCode()); - } - - //更新工单审批id - ticketsEntity.setTicketsId(Long.valueOf(ticketsId)); - ticketsEntity.setUpdateTime(new Date()); - ticketsService.updateById(ticketsEntity); - - return R.ok("操作成功"); - } @Override @Transactional public R completeTaskById(FlowProcessParam params) { @@ -406,6 +355,10 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI if (StringUtils.isBlank(processInstance)) { return R.error("流程Id不能为空"); } + + if (StringUtils.isBlank(result)) { + return R.error("审批结果不能为空"); + } Task secondTask = taskService.createTaskQuery() .processInstanceId(processInstance) .singleResult(); @@ -416,32 +369,43 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI secondApprovalVars.put("approvalResult", true); ticketsEntity.setStatus(TicketsStatusEnums.FINISH.getCode()); ticketsEntity.setFinishTime(new Date()); - ticketsEntity.setAssignUserId(TicketUserEnums.SPECIALIST.getCode()); + ticketsEntity.setAssignUserId(ShiroUtils.getUserEntity().getCreateUserId()); taskService.complete(secondTask.getId(), secondApprovalVars); } // 继续流程 if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("同意")) { secondApprovalVars.put("approvalResult", false); - ticketsEntity.setAssignUserId(TicketUserEnums.MANAGER.getCode()); + //指定角色为售后经理 + List users = sysUserRoleService.queryRoleIdList(TicketUserEnums.MANAGER.getCode()); + if (CollectionUtils.isEmpty(users)){ + throw new RRException("未配置售后经理角色用户"); + } + ticketsEntity.setAssignUserId(users.get(0)); taskService.complete(secondTask.getId(), secondApprovalVars); } // 指派处理人 if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("指派")) { - String userId = params.getUserId(); + String userId = String.valueOf(params.getUserId()); + ticketsEntity.setAssignUserId(Long.valueOf(userId)); Map startVars = new HashMap<>(); startVars.put("user1",userId); - ticketsEntity.setAssignUserId(Long.valueOf(userId)); taskService.complete(secondTask.getId(), startVars); } // 继续流程 if (Objects.nonNull(secondTask) && StrUtil.isNotEmpty(result) && result.equals("提交")) { - ticketsEntity.setAssignUserId(TicketUserEnums.SPECIALIST.getCode()); + //技术员提交-售后处理：谁创建谁终结 + List list = actHiProcessinfoService.list(new LambdaQueryWrapper() + .eq(ActHiProcessinfoEntity::getProcInstId, processInstance) + .orderByAsc(ActHiProcessinfoEntity::getCreateTime).last("limit 1")); + ActHiProcessinfoEntity actHiProcessinfo = list.get(0); + ticketsEntity.setAssignUserId(actHiProcessinfo.getCreateId()); taskService.complete(secondTask.getId(), secondApprovalVars); } if (StringUtils.isNotBlank(processName)&& processName.contains("完结")){ ticketsEntity.setStatus(TicketsStatusEnums.FINISH.getCode()); } + //更新工单审批id ticketsEntity.setTicketsId(Long.valueOf(ticketsId)); ticketsEntity.setUpdateTime(new Date()); @@ -453,6 +417,7 @@ public class FlwInstanceServiceImpl extends FlowServiceNoFactory implements FlwI actHiProcessinfoEntity.setProcName(processName); actHiProcessinfoEntity.setCreateTime(new Date()); actHiProcessinfoEntity.setCreateName(username); + actHiProcessinfoEntity.setCreateId(ShiroUtils.getUserEntity().getCreateUserId()); actHiProcessinfoService.save(actHiProcessinfoEntity); return R.ok("操作成功"); } diff --git a/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java b/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java index 666c67a..eeca4c5 100644 --- a/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java +++ b/base-fast/src/main/java/com/boge/modules/price/controller/PriceController.java @@ -129,7 +129,7 @@ public class PriceController { } /** - * 审核 + * 打印服务 */ @RequestMapping("/export") //@RequiresPermissions("flow:contract:delete") @@ -140,4 +140,17 @@ public class PriceController { localStorageService.downloadExcelModel(pathResource.getPath(),response,(JSONObject)JSON.toJSON(contract),JSONArray.parseArray(materialJson)); return R.ok(); } + + /** + * 打印服务2 + */ + @RequestMapping("/export2") + //@RequiresPermissions("flow:contract:delete") + public R export2(Integer priceId, HttpServletResponse response){ + PriceEntity contract = priceService.getById(priceId); + ClassPathResource pathResource = new ClassPathResource("static/model/报价单样式.xls");// 根目录 + String materialJson = contract.getMaterialJson(); + localStorageService.downloadExcelModel(pathResource.getPath(),response,(JSONObject)JSON.toJSON(contract),JSONArray.parseArray(materialJson)); + return R.ok(); + } } diff --git a/base-fast/src/main/java/com/boge/modules/screen/ScreenController.java b/base-fast/src/main/java/com/boge/modules/screen/ScreenController.java new file mode 100644 index 0000000..cc8b77d --- /dev/null +++ b/base-fast/src/main/java/com/boge/modules/screen/ScreenController.java @@ -0,0 +1,19 @@ +package com.boge.modules.screen; + +import com.boge.common.utils.R; +import com.boge.modules.price.entity.PriceEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("screen") +public class ScreenController { + + @RequestMapping("/info") + //@RequiresPermissions("flow:contract:info") + public R info(){ + + return R.ok(); + } +} diff --git a/base-fast/src/main/java/com/boge/modules/screen/dto/ScreenDto.java b/base-fast/src/main/java/com/boge/modules/screen/dto/ScreenDto.java new file mode 100644 index 0000000..4754be4 --- /dev/null +++ b/base-fast/src/main/java/com/boge/modules/screen/dto/ScreenDto.java @@ -0,0 +1,34 @@ +package com.boge.modules.screen.dto; + +import com.boge.modules.knowledge.service.dto.KnowledgeVO; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class ScreenDto { + YearTicket yearTicket; + List weekTickets; + FlowData flowData; + List knowledgeVOS; +} +@Data +class YearTicket{ + //年度工单情况 + public Integer finish; + public Integer undo; +} +@Data +class WeekTicket{ + //日期-工单数 + public Date finish; + public Integer total; +} +@Data +class FlowData{ + public Integer myStart; + public Integer myDo; + public Integer myfinish; +} + diff --git a/base-fast/src/main/java/com/boge/modules/sys/dao/SysUserRoleDao.java b/base-fast/src/main/java/com/boge/modules/sys/dao/SysUserRoleDao.java index d27174d..549d90f 100644 --- a/base-fast/src/main/java/com/boge/modules/sys/dao/SysUserRoleDao.java +++ b/base-fast/src/main/java/com/boge/modules/sys/dao/SysUserRoleDao.java @@ -11,6 +11,7 @@ package com.boge.modules.sys.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.boge.modules.sys.entity.SysUserRoleEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -21,11 +22,13 @@ import java.util.List; */ @Mapper public interface SysUserRoleDao extends BaseMapper { - + /** * 根据用户ID，获取角色ID列表 */ List queryRoleIdList(Long userId); + @Select("select user_id from sys_user_role where role_id = #{userId}") + List queryUserIdList(Long userId); /** diff --git a/base-fast/src/main/java/com/boge/modules/sys/service/SysUserRoleService.java b/base-fast/src/main/java/com/boge/modules/sys/service/SysUserRoleService.java index 07012ad..7d3ced4 100644 --- a/base-fast/src/main/java/com/boge/modules/sys/service/SysUserRoleService.java +++ b/base-fast/src/main/java/com/boge/modules/sys/service/SysUserRoleService.java @@ -21,13 +21,14 @@ import java.util.List; * @author Mark sunlightcs@gmail.com */ public interface SysUserRoleService extends IService { - + void saveOrUpdate(Long userId, List roleIdList); - + /** * 根据用户ID，获取角色ID列表 */ List queryRoleIdList(Long userId); + List queryUserIdList(Long roleId); /** * 根据角色ID数组，批量删除 diff --git a/base-fast/src/main/java/com/boge/modules/sys/service/impl/SysUserRoleServiceImpl.java b/base-fast/src/main/java/com/boge/modules/sys/service/impl/SysUserRoleServiceImpl.java index 1586353..688e886 100644 --- a/base-fast/src/main/java/com/boge/modules/sys/service/impl/SysUserRoleServiceImpl.java +++ b/base-fast/src/main/java/com/boge/modules/sys/service/impl/SysUserRoleServiceImpl.java @@ -51,6 +51,12 @@ public class SysUserRoleServiceImpl extends ServiceImpl queryUserIdList(Long roleId) { + return baseMapper.queryRoleIdList(roleId); + + } + @Override public int deleteBatch(Long[] roleIds){ return baseMapper.deleteBatch(roleIds); diff --git a/base-fast/src/main/resources/application.yml b/base-fast/src/main/resources/application.yml index 7b6577b..50b2cdd 100644 --- a/base-fast/src/main/resources/application.yml +++ b/base-fast/src/main/resources/application.yml @@ -88,7 +88,7 @@ file: avatarMaxSize: 5 ProcessInstance: - defId: Process_1:9:70cda2de-bb83-11f0-a10e-e60d36456f41 + defId: Process_1:10:e094f528-fe81-11f0-a80d-96bcd39f3c5b diff --git a/base-fast/src/main/resources/templates/合同.docx b/base-fast/src/main/resources/templates/合同.docx index 4916ed4ff05b78842d03fc60dbf10a643d6ed90b..2c417d876eb3e7acb1b441ed8ad36c25214db930 100644 GIT binary patch delta 16507 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∾^k$oG2}@H^(LZhVP}l>2FQ5~+ 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 aK*#73EdmG-FaQ{U3Mub80Q^6~15!f( delta 13513 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 J`2HjK{{W?>#D4$) diff --git a/base-vue/.eslintrc.js b/base-vue/.eslintrc.js index 2ae1547..1ee2b20 100644 --- a/base-vue/.eslintrc.js +++ b/base-vue/.eslintrc.js @@ -19,8 +19,8 @@ module.exports = { rules: { // allow async-await 'generator-star-spacing': 'off', - // allow debugger during development - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + // allow during development + 'no- ': process.env.NODE_ENV === 'production' ? 'error' : 'off' }, global:{ PubSub:true diff --git a/base-vue/src/views/common/UploadDialog.vue b/base-vue/src/views/common/UploadDialog.vue index 350dd0f..950e8e4 100644 --- a/base-vue/src/views/common/UploadDialog.vue +++ b/base-vue/src/views/common/UploadDialog.vue @@ -99,7 +99,7 @@ export default { var formdata = new FormData() formdata.append('file', this.file1.raw) // excelImport：请求接口 formdata：传递参数 - debugger + this.$http({ url: this.$http.adornUrl(this.urlApi), method: 'post', diff --git a/base-vue/src/views/modules/contract/contract-add-or-update.vue b/base-vue/src/views/modules/contract/contract-add-or-update.vue index fe2f8c5..89339ac 100644 --- a/base-vue/src/views/modules/contract/contract-add-or-update.vue +++ b/base-vue/src/views/modules/contract/contract-add-or-update.vue @@ -509,7 +509,7 @@ export default { }) }, reLoad (row) { - debugger + let price = JSON.parse(row.data) this.dataForm.priceType = String(price.priceType) this.dataForm.contractCode = price.contractCode @@ -670,7 +670,7 @@ export default { this.$refs.upload.submit(); }, submitPrice () { - debugger + if (this.fileList.length > 0) { this.fileList.forEach(a => { if (a.size > 10 * 1024 * 1024) { diff --git a/base-vue/src/views/modules/price/approval.vue b/base-vue/src/views/modules/price/approval.vue index a59ec77..51629d0 100644 --- a/base-vue/src/views/modules/price/approval.vue +++ b/base-vue/src/views/modules/price/approval.vue @@ -414,7 +414,7 @@ export default { }) }, reLoad (row) { - debugger + let price = JSON.parse(row.data) this.dataForm.priceType = String(price.priceType) this.dataForm.fileNo = price.fileNo @@ -651,16 +651,16 @@ export default { this.$message.error('请选择审批结果') return } - + // 验证是否填写了处理意见 if (!this.approvalForm.remark) { this.$message.error('请输入处理意见') return } - + // 根据审批结果设置status值：同意为2，驳回为3 const status = this.approvalForm.result === '同意' ? '2' : '3' - + // 调用后端接口 this.$http({ url: this.$http.adornUrl('/flow/price/approval'), diff --git a/base-vue/src/views/modules/price/price-add-or-update.vue b/base-vue/src/views/modules/price/price-add-or-update.vue index 81de0be..193b87c 100644 --- a/base-vue/src/views/modules/price/price-add-or-update.vue +++ b/base-vue/src/views/modules/price/price-add-or-update.vue @@ -407,7 +407,7 @@ export default { }) }, reLoad (row) { - debugger + let price = JSON.parse(row.data) this.dataForm.priceType = String(price.priceType) this.dataForm.fileNo = price.fileNo diff --git a/base-vue/src/views/modules/tickets/approval.vue b/base-vue/src/views/modules/tickets/approval.vue index 71e1f57..3221628 100644 --- a/base-vue/src/views/modules/tickets/approval.vue +++ b/base-vue/src/views/modules/tickets/approval.vue @@ -144,7 +144,7 @@ -
+
指派：{{ assignedUsername }}
- - 同意 + + 提交 完结 - -
- 意见隐藏 -
- 跟踪 -
-
- -
- 存为草稿 - 暂存待办 +
提交
+
+ 完结 +
@@ -254,7 +247,7 @@ export default { assignedUsername: '', // 审批表单数据 approvalForm: { - result: '指派', // 默认为同意 + result: '', // 默认为同意 remark: '', // 处理意见 hideOpinion: false, // 意见隐藏 track: false, // 跟踪 @@ -409,9 +402,14 @@ export default { this.ticketsData = data.tickets; } const user = this.ticketsData.processInstanceUser; - if (user && (user.includes('指派') || user.includes('完结'))) { - this.approvalForm.result = '提交'; // 自动选中“同意” + if (user.includes('完结')) { + this.approvalForm.result = '提交' // 自动选中“同意” + } else if (user.includes('指派')) { + this.approvalForm.result = '指派' // 自动选中“同意” + }else if (user.includes('技术员')|| user.includes('维修员')) { + this.approvalForm.result = '提交' // 自动选中“同意” } + this.$http({ url: this.$http.adornUrl(`/flw/instance/flowProcessList`), method: 'get', @@ -423,7 +421,6 @@ export default { }, // 提交审批 submitApproval() { - debugger if (!this.approvalForm.remark && this.approvalForm.result === '完结') { this.$message.warning('完结时请填写处理意见'); return; @@ -434,7 +431,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - debugger + var formdata = new FormData() this.fileList.forEach(a => { formdata.append('file', a.raw) diff --git a/base-vue/src/views/modules/tickets/备用.vue b/base-vue/src/views/modules/tickets/备用.vue index 71e1f57..2836fa0 100644 --- a/base-vue/src/views/modules/tickets/备用.vue +++ b/base-vue/src/views/modules/tickets/备用.vue @@ -144,7 +144,7 @@ -
+
指派：{{ assignedUsername }}
- - 同意 + + 提交 完结 @@ -423,7 +423,7 @@ export default { }, // 提交审批 submitApproval() { - debugger + if (!this.approvalForm.remark && this.approvalForm.result === '完结') { this.$message.warning('完结时请填写处理意见'); return; @@ -434,7 +434,7 @@ export default { cancelButtonText: '取消', type: 'warning' }).then(() => { - debugger + var formdata = new FormData() this.fileList.forEach(a => { formdata.append('file', a.raw) diff --git a/base-vue/static/plugins/ueditor-1.4.3.3/third-party/video-js/video.dev.js b/base-vue/static/plugins/ueditor-1.4.3.3/third-party/video-js/video.dev.js index d01ea60..af4f2b4 100644 --- a/base-vue/static/plugins/ueditor-1.4.3.3/third-party/video-js/video.dev.js +++ b/base-vue/static/plugins/ueditor-1.4.3.3/third-party/video-js/video.dev.js @@ -4414,12 +4414,12 @@ vjs.SeekBar.prototype.onMouseMove = function(event){ }; vjs.SeekBar.prototype.onMouseUp = function(event){ - debugger + vjs.Slider.prototype.onMouseUp.call(this, event); this.player_.scrubbing = false; if (this.videoWasPlaying) { - debugger + this.player_.play(); } }; diff --git a/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.flashonly.js b/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.flashonly.js index 10f4496..3029297 100644 --- a/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.flashonly.js +++ b/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.flashonly.js @@ -147,7 +147,7 @@ return { Deferred: $.Deferred, when: $.when, - + isPromise: function( anything ) { return anything && typeof anything.then === 'function'; } @@ -164,7 +164,7 @@ /** * @fileOverview 基础类方法。 */ - + /** * Web Uploader内部类的详细说明，以下提及的功能类，都可以在`WebUploader`这个变量中访问到。 * @@ -185,10 +185,10 @@ 'dollar', 'promise' ], function( $, promise ) { - + var noop = function() {}, call = Function.call; - + // http://jsperf.com/uncurrythis // 反科里化 function uncurryThis( fn ) { @@ -196,16 +196,16 @@ return call.apply( fn, arguments ); }; } - + function bindFn( fn, context ) { return function() { return fn.apply( context, arguments ); }; } - + function createObject( proto ) { var f; - + if ( Object.create ) { return Object.create( proto ); } else { @@ -214,30 +214,30 @@ return new f(); } } - - + + /** * 基础类，提供一些简单常用的方法。 * @class Base */ return { - + /** * @property {String} version 当前版本号。 */ version: '0.1.2', - + /** * @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。 */ $: $, - + Deferred: promise.Deferred, - + isPromise: promise.isPromise, - + when: promise.when, - + /** * @description 简单的浏览器检查结果。 * @@ -255,23 +255,23 @@ webkit = ua.match( /WebKit\/([\d.]+)/ ), chrome = ua.match( /Chrome\/([\d.]+)/ ) || ua.match( /CriOS\/([\d.]+)/ ), - + ie = ua.match( /MSIE\s([\d\.]+)/ ) || ua.match(/(?:trident)(?:.*rv:([\w.]+))?/i), firefox = ua.match( /Firefox\/([\d.]+)/ ), safari = ua.match( /Safari\/([\d.]+)/ ), opera = ua.match( /OPR\/([\d.]+)/ ); - + webkit && (ret.webkit = parseFloat( webkit[ 1 ] )); chrome && (ret.chrome = parseFloat( chrome[ 1 ] )); ie && (ret.ie = parseFloat( ie[ 1 ] )); firefox && (ret.firefox = parseFloat( firefox[ 1 ] )); safari && (ret.safari = parseFloat( safari[ 1 ] )); opera && (ret.opera = parseFloat( opera[ 1 ] )); - + return ret; })( navigator.userAgent ), - + /** * @description 操作系统检查结果。 * @@ -281,18 +281,18 @@ */ os: (function( ua ) { var ret = {}, - + // osx = !!ua.match( /\(Macintosh\; Intel / ), android = ua.match( /(?:Android);?[\s\/]+([\d.]+)?/ ), ios = ua.match( /(?:iPad|iPod|iPhone).*OS\s([\d_]+)/ ); - + // osx && (ret.osx = true); android && (ret.android = parseFloat( android[ 1 ] )); ios && (ret.ios = parseFloat( ios[ 1 ].replace( /_/g, '.' ) )); - + return ret; })( navigator.userAgent ), - + /** * 实现类与类之间的继承。 * @method inherits @@ -330,7 +330,7 @@ */ inherits: function( Super, protos, staticProtos ) { var child; - + if ( typeof protos === 'function' ) { child = protos; protos = null; @@ -341,29 +341,29 @@ return Super.apply( this, arguments ); }; } - + // 复制静态方法 $.extend( true, child, Super, staticProtos || {} ); - + /* jshint camelcase: false */ - + // 让子类的__super__属性指向父类。 child.__super__ = Super.prototype; - + // 构建原型，添加原型方法或属性。 // 暂时用Object.create实现。 child.prototype = createObject( Super.prototype ); protos && $.extend( true, child.prototype, protos ); - + return child; }, - + /** * 一个不做任何事情的方法。可以用来赋值给默认的callback. * @method noop */ noop: noop, - + /** * 返回一个新的方法，此方法将已指定的`context`来执行。 * @grammar Base.bindFn( fn, context ) => Function @@ -381,7 +381,7 @@ * */ bindFn: bindFn, - + /** * 引用Console.log如果存在的话，否则引用一个[空函数loop](#WebUploader:Base.log)。 * @grammar Base.log( args... ) => undefined @@ -393,13 +393,13 @@ } return noop; })(), - + nextTick: (function() { - + return function( cb ) { setTimeout( cb, 1 ); }; - + // @bug 当浏览器不在当前窗口时就停了。 // var next = window.requestAnimationFrame || // window.webkitRequestAnimationFrame || @@ -407,11 +407,11 @@ // function( cb ) { // window.setTimeout( cb, 1000 / 60 ); // }; - + // // fix: Uncaught TypeError: Illegal invocation // return bindFn( next, window ); })(), - + /** * 被[uncurrythis](http://www.2ality.com/2011/11/uncurrying-this.html)的数组slice方法。 * 将用来将非数组对象转化成数组对象。 @@ -426,7 +426,7 @@ * doSomthing( 'ignored', 'arg2', 'arg3' ); // => Array ["arg2", "arg3"] */ slice: uncurryThis( [].slice ), - + /** * 生成唯一的ID * @method guid @@ -435,19 +435,19 @@ */ guid: (function() { var counter = 0; - + return function( prefix ) { var guid = (+new Date()).toString( 32 ), i = 0; - + for ( ; i < 5; i++ ) { guid += Math.floor( Math.random() * 65535 ).toString( 32 ); } - + return (prefix || 'wu_') + guid + (counter++).toString( 32 ); }; })(), - + /** * 格式化文件大小, 输出成带单位的字符串 * @method formatSize @@ -467,13 +467,13 @@ */ formatSize: function( size, pointLength, units ) { var unit; - + units = units || [ 'B', 'K', 'M', 'G', 'TB' ]; - + while ( (unit = units.shift()) && size > 1024 ) { size = size / 1024; } - + return (unit === 'B' ? size : size.toFixed( pointLength || 2 )) + unit; } @@ -490,7 +490,7 @@ slice = [].slice, separator = /\s+/, protos; - + // 根据条件过滤出事件handlers. function findHandlers( arr, name, callback, context ) { return $.grep( arr, function( handler ) { @@ -501,34 +501,34 @@ (!context || handler.ctx === context); }); } - + function eachEvent( events, callback, iterator ) { // 不支持对象，只支持多个event用空格隔开 $.each( (events || '').split( separator ), function( _, key ) { iterator( key, callback ); }); } - + function triggerHanders( events, args ) { var stoped = false, i = -1, len = events.length, handler; - + while ( ++i < len ) { handler = events[ i ]; - + if ( handler.cb.apply( handler.ctx2, args ) === false ) { stoped = true; break; } } - + return !stoped; } - + protos = { - + /** * 绑定事件。 * @@ -569,27 +569,27 @@ on: function( name, callback, context ) { var me = this, set; - + if ( !callback ) { return this; } - + set = this._events || (this._events = []); - + eachEvent( name, callback, function( name, callback ) { var handler = { e: name }; - + handler.cb = callback; handler.ctx = context; handler.ctx2 = context || me; handler.id = set.length; - + set.push( handler ); }); - + return this; }, - + /** * 绑定事件，且当handler执行完后，自动解除绑定。 * @method once @@ -602,24 +602,24 @@ */ once: function( name, callback, context ) { var me = this; - + if ( !callback ) { return me; } - + eachEvent( name, callback, function( name, callback ) { var once = function() { me.off( name, once ); return callback.apply( context || me, arguments ); }; - + once._cb = callback; me.on( name, once, context ); }); - + return me; }, - + /** * 解除事件绑定 * @method off @@ -632,25 +632,25 @@ */ off: function( name, cb, ctx ) { var events = this._events; - + if ( !events ) { return this; } - + if ( !name && !cb && !ctx ) { this._events = []; return this; } - + eachEvent( name, cb, function( name, cb ) { $.each( findHandlers( events, name, cb, ctx ), function() { delete events[ this.id ]; }); }); - + return this; }, - + /** * 触发事件 * @method trigger @@ -661,20 +661,20 @@ */ trigger: function( type ) { var args, events, allEvents; - + if ( !this._events || !type ) { return this; } - + args = slice.call( arguments, 1 ); events = findHandlers( this._events, type ); allEvents = findHandlers( this._events, 'all' ); - + return triggerHanders( events, args ) && triggerHanders( allEvents, arguments ); } }; - + /** * 中介者，它本身是个单例，但可以通过[installTo](#WebUploader:Mediator:installTo)方法，使任何对象具备事件行为。 * 主要目的是负责模块与模块之间的合作，降低耦合度。 @@ -682,7 +682,7 @@ * @class Mediator */ return $.extend({ - + /** * 可以通过这个接口，使任何对象具备事件功能。 * @method installTo @@ -692,7 +692,7 @@ installTo: function( obj ) { return $.extend( obj, protos ); } - + }, protos ); }); /** @@ -702,9 +702,9 @@ 'base', 'mediator' ], function( Base, Mediator ) { - + var $ = Base.$; - + /** * 上传入口类。 * @class Uploader @@ -722,12 +722,12 @@ this.options = $.extend( true, {}, Uploader.options, opts ); this._init( this.options ); } - + // default Options // widgets中有相应扩展 Uploader.options = {}; Mediator.installTo( Uploader.prototype ); - + // 批量添加纯命令式方法。 $.each({ upload: 'start-upload', @@ -754,19 +754,19 @@ return this.request( command, arguments ); }; }); - + $.extend( Uploader.prototype, { state: 'pending', - + _init: function( opts ) { var me = this; - + me.request( 'init', opts, function() { me.state = 'ready'; me.trigger('ready'); }); }, - + /** * 获取或者设置Uploader配置项。 * @method option @@ -787,22 +787,22 @@ */ option: function( key, val ) { var opts = this.options; - + // setter if ( arguments.length > 1 ) { - + if ( $.isPlainObject( val ) && $.isPlainObject( opts[ key ] ) ) { $.extend( opts[ key ], val ); } else { opts[ key ] = val; } - + } else { // getter return key ? opts[ key ] : opts; } }, - + /** * 获取文件统计信息。返回一个包含一下信息的对象。 * * `successNum` 上传成功的文件数 @@ -816,10 +816,10 @@ getStats: function() { // return this._mgr.getStats.apply( this._mgr, arguments ); var stats = this.request('get-stats'); - + return { successNum: stats.numOfSuccess, - + // who care? // queueFailNum: 0, cancelNum: stats.numOfCancel, @@ -828,40 +828,40 @@ queueNum: stats.numOfQueue }; }, - + // 需要重写此方法来来支持opts.onEvent和instance.onEvent的处理器 trigger: function( type/*, args...*/ ) { var args = [].slice.call( arguments, 1 ), opts = this.options, name = 'on' + type.substring( 0, 1 ).toUpperCase() + type.substring( 1 ); - + if ( // 调用通过on方法注册的handler. Mediator.trigger.apply( this, arguments ) === false || - + // 调用opts.onEvent $.isFunction( opts[ name ] ) && opts[ name ].apply( this, args ) === false || - + // 调用this.onEvent $.isFunction( this[ name ] ) && this[ name ].apply( this, args ) === false || - + // 广播所有uploader的事件。 Mediator.trigger.apply( Mediator, [ this, type ].concat( args ) ) === false ) { - + return false; } - + return true; }, - + // widgets/widget.js将补充此方法的详细文档。 request: Base.noop }); - + /** * 创建Uploader实例，等同于new Uploader( opts ); * @method create @@ -872,10 +872,10 @@ Base.create = Uploader.create = function( opts ) { return new Uploader( opts ); }; - + // 暴露Uploader，可以通过它来扩展业务逻辑。 Base.Uploader = Uploader; - + return Uploader; }); /** @@ -885,10 +885,10 @@ 'base', 'mediator' ], function( Base, Mediator ) { - + var $ = Base.$, factories = {}, - + // 获取对象的第一个key getFirstKey = function( obj ) { for ( var key in obj ) { @@ -898,7 +898,7 @@ } return null; }; - + // 接口类。 function Runtime( options ) { this.options = $.extend({ @@ -906,20 +906,20 @@ }, options ); this.uid = Base.guid('rt_'); } - + $.extend( Runtime.prototype, { - + getContainer: function() { var opts = this.options, parent, container; - + if ( this._container ) { return this._container; } - + parent = $( opts.container || document.body ); container = $( document.createElement('div') ); - + container.attr( 'id', 'rt_' + this.uid ); container.css({ position: 'absolute', @@ -929,28 +929,28 @@ height: '1px', overflow: 'hidden' }); - + parent.append( container ); parent.addClass('webuploader-container'); this._container = container; return container; }, - + init: Base.noop, exec: Base.noop, - + destroy: function() { if ( this._container ) { this._container.parentNode.removeChild( this.__container ); } - + this.off(); } }); - + Runtime.orders = 'html5,flash'; - - + + /** * 添加Runtime实现。 * @param {String} type 类型 @@ -959,14 +959,14 @@ Runtime.addRuntime = function( type, factory ) { factories[ type ] = factory; }; - + Runtime.hasRuntime = function( type ) { return !!(type ? factories[ type ] : getFirstKey( factories )); }; - + Runtime.create = function( opts, orders ) { var type, runtime; - + orders = orders || Runtime.orders; $.each( orders.split( /\s*,\s*/g ), function() { if ( factories[ this ] ) { @@ -974,21 +974,21 @@ return false; } }); - + type = type || getFirstKey( factories ); - + if ( !type ) { throw new Error('Runtime Error'); } - + runtime = new factories[ type ]( opts ); return runtime; }; - + Mediator.installTo( Runtime.prototype ); return Runtime; }); - + /** * @fileOverview Runtime管理器，负责Runtime的选择, 连接 */ @@ -997,69 +997,69 @@ 'mediator', 'runtime/runtime' ], function( Base, Mediator, Runtime ) { - + var cache; - + cache = (function() { var obj = {}; - + return { add: function( runtime ) { obj[ runtime.uid ] = runtime; }, - + get: function( ruid, standalone ) { var i; - + if ( ruid ) { return obj[ ruid ]; } - + for ( i in obj ) { // 有些类型不能重用，比如filepicker. if ( standalone && obj[ i ].__standalone ) { continue; } - + return obj[ i ]; } - + return null; }, - + remove: function( runtime ) { delete obj[ runtime.uid ]; } }; })(); - + function RuntimeClient( component, standalone ) { var deferred = Base.Deferred(), runtime; - + this.uid = Base.guid('client_'); - + // 允许runtime没有初始化之前，注册一些方法在初始化后执行。 this.runtimeReady = function( cb ) { return deferred.done( cb ); }; - + this.connectRuntime = function( opts, cb ) { - + // already connected. if ( runtime ) { throw new Error('already connected!'); } - + deferred.done( cb ); - + if ( typeof opts === 'string' && cache.get( opts ) ) { runtime = cache.get( opts ); } - + // 像filePicker只能独立存在，不能公用。 runtime = runtime || cache.get( null, standalone ); - + // 需要创建 if ( !runtime ) { runtime = Runtime.create( opts, opts.runtimeOrder ); @@ -1074,46 +1074,46 @@ runtime.__promise.then( deferred.resolve ); runtime.__client++; } - + standalone && (runtime.__standalone = standalone); return runtime; }; - + this.getRuntime = function() { return runtime; }; - + this.disconnectRuntime = function() { if ( !runtime ) { return; } - + runtime.__client--; - + if ( runtime.__client <= 0 ) { cache.remove( runtime ); delete runtime.__promise; runtime.destroy(); } - + runtime = null; }; - + this.exec = function() { if ( !runtime ) { return; } - + var args = Base.slice( arguments ); component && args.unshift( component ); - + return runtime.exec.apply( this, args ); }; - + this.getRuid = function() { return runtime && runtime.uid; }; - + this.destroy = (function( destroy ) { return function() { destroy && destroy.apply( this, arguments ); @@ -1124,7 +1124,7 @@ }; })( this.destroy ); } - + Mediator.installTo( RuntimeClient.prototype ); return RuntimeClient; }); @@ -1135,36 +1135,36 @@ 'base', 'runtime/client' ], function( Base, RuntimeClient ) { - + function Blob( ruid, source ) { var me = this; - + me.source = source; me.ruid = ruid; - + RuntimeClient.call( me, 'Blob' ); - + this.uid = source.uid || this.uid; this.type = source.type || ''; this.size = source.size || 0; - + if ( ruid ) { me.connectRuntime( ruid ); } } - + Base.inherits( RuntimeClient, { constructor: Blob, - + slice: function( start, end ) { return this.exec( 'slice', start, end ); }, - + getSource: function() { return this.source; } }); - + return Blob; }); /** @@ -1176,39 +1176,39 @@ 'base', 'lib/blob' ], function( Base, Blob ) { - + var uid = 1, rExt = /\.([^.]+)$/; - + function File( ruid, file ) { var ext; - + Blob.apply( this, arguments ); this.name = file.name || ('untitled' + uid++); ext = rExt.exec( file.name ) ? RegExp.$1.toLowerCase() : ''; - + // todo 支持其他类型文件的转换。 - + // 如果有mimetype, 但是文件名里面没有找出后缀规律 if ( !ext && this.type ) { ext = /\/(jpg|jpeg|png|gif|bmp)$/i.exec( this.type ) ? RegExp.$1.toLowerCase() : ''; this.name += '.' + ext; } - + // 如果没有指定mimetype, 但是知道文件后缀。 if ( !this.type && ~'jpg,jpeg,png,gif,bmp'.indexOf( ext ) ) { this.type = 'image/' + (ext === 'jpg' ? 'jpeg' : ext); } - + this.ext = ext; this.lastModifiedDate = file.lastModifiedDate || (new Date()).toLocaleString(); } - + return Base.inherits( Blob, File ); }); - + /** * @fileOverview 错误信息 */ @@ -1217,28 +1217,28 @@ 'runtime/client', 'lib/file' ], function( Base, RuntimeClent, File ) { - + var $ = Base.$; - + function FilePicker( opts ) { opts = this.options = $.extend({}, FilePicker.options, opts ); - + opts.container = $( opts.id ); - + if ( !opts.container.length ) { throw new Error('按钮指定错误'); } - + opts.innerHTML = opts.innerHTML || opts.label || opts.container.html() || ''; - + opts.button = $( opts.button || document.createElement('div') ); opts.button.html( opts.innerHTML ); opts.container.html( opts.button ); - + RuntimeClent.call( this, 'FilePicker', true ); } - + FilePicker.options = { button: null, container: null, @@ -1248,34 +1248,34 @@ accept: null, name: 'file' }; - + Base.inherits( RuntimeClent, { constructor: FilePicker, - + init: function() { var me = this, opts = me.options, button = opts.button; - + button.addClass('webuploader-pick'); - + me.on( 'all', function( type ) { var files; - + switch ( type ) { case 'mouseenter': button.addClass('webuploader-pick-hover'); break; - + case 'mouseleave': button.removeClass('webuploader-pick-hover'); break; - + case 'change': files = me.exec('getFiles'); me.trigger( 'select', $.map( files, function( file ) { file = new File( me.getRuid(), file ); - + // 记录来源。 file._refer = opts.container; return file; @@ -1283,29 +1283,29 @@ break; } }); - + me.connectRuntime( opts, function() { me.refresh(); me.exec( 'init', opts ); me.trigger('ready'); }); - + $( window ).on( 'resize', function() { me.refresh(); }); }, - + refresh: function() { var shimContainer = this.getRuntime().getContainer(), button = this.options.button, width = button.outerWidth ? button.outerWidth() : button.width(), - + height = button.outerHeight ? button.outerHeight() : button.height(), - + pos = button.offset(); - + width && height && shimContainer.css({ bottom: 'auto', right: 'auto', @@ -1313,24 +1313,24 @@ height: height + 'px' }).offset( pos ); }, - + enable: function() { var btn = this.options.button; - + btn.removeClass('webuploader-pick-disable'); this.refresh(); }, - + disable: function() { var btn = this.options.button; - + this.getRuntime().getContainer().css({ top: '-99999px' }); - + btn.addClass('webuploader-pick-disable'); }, - + destroy: function() { if ( this.runtime ) { this.exec('destroy'); @@ -1338,10 +1338,10 @@ } } }); - + return FilePicker; }); - + /** * @fileOverview 组件基类。 */ @@ -1349,60 +1349,60 @@ 'base', 'uploader' ], function( Base, Uploader ) { - + var $ = Base.$, _init = Uploader.prototype._init, IGNORE = {}, widgetClass = []; - + function isArrayLike( obj ) { if ( !obj ) { return false; } - + var length = obj.length, type = $.type( obj ); - + if ( obj.nodeType === 1 && length ) { return true; } - + return type === 'array' || type !== 'function' && type !== 'string' && (length === 0 || typeof length === 'number' && length > 0 && (length - 1) in obj); } - + function Widget( uploader ) { this.owner = uploader; this.options = uploader.options; } - + $.extend( Widget.prototype, { - + init: Base.noop, - + // 类Backbone的事件监听声明，监听uploader实例上的事件 // widget直接无法监听事件，事件只能通过uploader来传递 invoke: function( apiName, args ) { - + /* { 'make-thumb': 'makeThumb' } */ var map = this.responseMap; - + // 如果无API响应声明则忽略 if ( !map || !(apiName in map) || !(map[ apiName ] in this) || !$.isFunction( this[ map[ apiName ] ] ) ) { - + return IGNORE; } - + return this[ map[ apiName ] ].apply( this, args ); - + }, - + /** * 发送命令。当传入`callback`或者`handler`中返回`promise`时。返回一个当所有`handler`中的promise都完成后完成的新`promise`。 * @method request @@ -1414,22 +1414,22 @@ return this.owner.request.apply( this.owner, arguments ); } }); - + // 扩展Uploader. $.extend( Uploader.prototype, { - + // 覆写_init用来初始化widgets _init: function() { var me = this, widgets = me._widgets = []; - + $.each( widgetClass, function( _, klass ) { widgets.push( new klass( me ) ); }); - + return _init.apply( me, arguments ); }, - + request: function( apiName, args, callback ) { var i = 0, widgets = this._widgets, @@ -1437,15 +1437,15 @@ rlts = [], dfds = [], widget, rlt, promise, key; - + args = isArrayLike( args ) ? args : [ args ]; - + for ( ; i < len; i++ ) { widget = widgets[ i ]; rlt = widget.invoke( apiName, args ); - + if ( rlt !== IGNORE ) { - + // Deferred对象 if ( Base.isPromise( rlt ) ) { dfds.push( rlt ); @@ -1454,22 +1454,22 @@ } } } - + // 如果有callback，则用异步方式。 if ( callback || dfds.length ) { promise = Base.when.apply( Base, dfds ); key = promise.pipe ? 'pipe' : 'then'; - + // 很重要不能删除。删除了会死循环。 // 保证执行顺序。让callback总是在下一个tick中执行。 return promise[ key ](function() { var deferred = Base.Deferred(), args = arguments; - + setTimeout(function() { deferred.resolve.apply( deferred, args ); }, 1 ); - + return deferred.promise(); })[ key ]( callback || Base.noop ); } else { @@ -1477,7 +1477,7 @@ } } }); - + /** * 添加组件 * @param {object} widgetProto 组件原型，构造函数通过constructor属性定义 @@ -1493,20 +1493,20 @@ Uploader.register = Widget.register = function( responseMap, widgetProto ) { var map = { init: 'init' }, klass; - + if ( arguments.length === 1 ) { widgetProto = responseMap; widgetProto.responseMap = map; } else { widgetProto.responseMap = $.extend( map, responseMap ); } - + klass = Base.inherits( Widget, widgetProto ); widgetClass.push( klass ); - + return klass; }; - + return Widget; }); /** @@ -1519,9 +1519,9 @@ 'widgets/widget' ], function( Base, Uploader, FilePicker ) { var $ = Base.$; - + $.extend( Uploader.options, { - + /** * @property {Selector | Object} [pick=undefined] * @namespace options @@ -1534,7 +1534,7 @@ * * `multiple` {Boolean} 是否开起同时选择多个文件能力。 */ pick: null, - + /** * @property {Arroy} [accept=null] * @namespace options @@ -1561,25 +1561,25 @@ mimeTypes: 'image/*' }*/ }); - + return Uploader.register({ 'add-btn': 'addButton', refresh: 'refresh', disable: 'disable', enable: 'enable' }, { - + init: function( opts ) { this.pickers = []; return opts.pick && this.addButton( opts.pick ); }, - + refresh: function() { $.each( this.pickers, function() { this.refresh(); }); }, - + /** * @method addButton * @for Uploader @@ -1597,41 +1597,41 @@ opts = me.options, accept = opts.accept, options, picker, deferred; - + if ( !pick ) { return; } - + deferred = Base.Deferred(); $.isPlainObject( pick ) || (pick = { id: pick }); - + options = $.extend({}, pick, { accept: $.isPlainObject( accept ) ? [ accept ] : accept, swf: opts.swf, runtimeOrder: opts.runtimeOrder }); - + picker = new FilePicker( options ); - + picker.once( 'ready', deferred.resolve ); picker.on( 'select', function( files ) { me.owner.request( 'add-file', [ files ]); }); picker.init(); - + this.pickers.push( picker ); - + return deferred.promise(); }, - + disable: function() { $.each( this.pickers, function() { this.disable(); }); }, - + enable: function() { $.each( this.pickers, function() { this.enable(); @@ -1648,88 +1648,88 @@ 'lib/blob' ], function( Base, RuntimeClient, Blob ) { var $ = Base.$; - + // 构造器。 function Image( opts ) { this.options = $.extend({}, Image.options, opts ); RuntimeClient.call( this, 'Image' ); - + this.on( 'load', function() { this._info = this.exec('info'); this._meta = this.exec('meta'); }); } - + // 默认选项。 Image.options = { - + // 默认的图片处理质量 quality: 90, - + // 是否裁剪 crop: false, - + // 是否保留头部信息 preserveHeaders: true, - + // 是否允许放大。 allowMagnify: true }; - + // 继承RuntimeClient. Base.inherits( RuntimeClient, { constructor: Image, - + info: function( val ) { - + // setter if ( val ) { this._info = val; return this; } - + // getter return this._info; }, - + meta: function( val ) { - + // setter if ( val ) { this._meta = val; return this; } - + // getter return this._meta; }, - + loadFromBlob: function( blob ) { var me = this, ruid = blob.getRuid(); - + this.connectRuntime( ruid, function() { me.exec( 'init', me.options ); me.exec( 'loadFromBlob', blob ); }); }, - + resize: function() { var args = Base.slice( arguments ); return this.exec.apply( this, [ 'resize' ].concat( args ) ); }, - + getAsDataUrl: function( type ) { return this.exec( 'getAsDataUrl', type ); }, - + getAsBlob: function( type ) { var blob = this.exec( 'getAsBlob', type ); - + return new Blob( this.getRuid(), blob ); } }); - + return Image; }); /** @@ -1741,24 +1741,24 @@ 'lib/image', 'widgets/widget' ], function( Base, Uploader, Image ) { - + var $ = Base.$, throttle; - + // 根据要处理的文件大小来节流，一次不能处理太多，会卡。 throttle = (function( max ) { var occupied = 0, waiting = [], tick = function() { var item; - + while ( waiting.length && occupied < max ) { item = waiting.shift(); occupied += item[ 0 ]; item[ 1 ](); } }; - + return function( emiter, size, cb ) { waiting.push([ size, cb ]); emiter.once( 'destroy', function() { @@ -1768,9 +1768,9 @@ setTimeout( tick, 1 ); }; })( 5 * 1024 * 1024 ); - + $.extend( Uploader.options, { - + /** * @property {Object} [thumb] * @namespace options @@ -1809,14 +1809,14 @@ allowMagnify: true, crop: true, preserveHeaders: false, - + // 为空的话则保留原有图片格式。 // 否则强制转换成指定的类型。 // IE 8下面 base64 大小不能超过 32K 否则预览失败，而非 jpeg 编码的图片很可 // 能会超过 32k, 所以这里设置成预览的时候都是 image/jpeg type: 'image/jpeg' }, - + /** * @property {Object} [compress] * @namespace options @@ -1853,13 +1853,13 @@ preserveHeaders: true } }); - + return Uploader.register({ 'make-thumb': 'makeThumb', 'before-send-file': 'compressImage' }, { - - + + /** * 生成缩略图，此过程为异步，所以需要传入`callback`。 * 通常情况在图片加入队里后调用此方法来生成预览图以增强交互效果。 @@ -1893,70 +1893,70 @@ */ makeThumb: function( file, cb, width, height ) { var opts, image; - + file = this.request( 'get-file', file ); - + // 只预览图片格式。 if ( !file.type.match( /^image/ ) ) { cb( true ); return; } - + opts = $.extend({}, this.options.thumb ); - + // 如果传入的是object. if ( $.isPlainObject( width ) ) { opts = $.extend( opts, width ); width = null; } - + width = width || opts.width; height = height || opts.height; - + image = new Image( opts ); - + image.once( 'load', function() { file._info = file._info || image.info(); file._meta = file._meta || image.meta(); image.resize( width, height ); }); - + image.once( 'complete', function() { cb( false, image.getAsDataUrl( opts.type ) ); image.destroy(); }); - + image.once( 'error', function() { cb( true ); image.destroy(); }); - + throttle( image, file.source.size, function() { file._info && image.info( file._info ); file._meta && image.meta( file._meta ); image.loadFromBlob( file.source ); }); }, - + compressImage: function( file ) { var opts = this.options.compress || this.options.resize, compressSize = opts && opts.compressSize || 300 * 1024, image, deferred; - + file = this.request( 'get-file', file ); - + // 只预览图片格式。 if ( !opts || !~'image/jpeg,image/jpg'.indexOf( file.type ) || file.size < compressSize || file._compressed ) { return; } - + opts = $.extend({}, opts ); deferred = Base.Deferred(); - + image = new Image( opts ); - + deferred.always(function() { image.destroy(); image = null; @@ -1967,27 +1967,27 @@ file._meta = file._meta || image.meta(); image.resize( opts.width, opts.height ); }); - + image.once( 'complete', function() { var blob, size; - + // 移动端 UC / qq 浏览器的无图模式下 // ctx.getImageData 处理大图的时候会报 Exception // INDEX_SIZE_ERR: DOM Exception 1 try { blob = image.getAsBlob( opts.type ); - + size = file.size; - + // 如果压缩后，比原来还大则不用压缩后的。 if ( blob.size < size ) { // file.source.destroy && file.source.destroy(); file.source = blob; file.size = blob.size; - + file.trigger( 'resize', blob.size, size ); } - + // 标记，避免重复压缩。 file._compressed = true; deferred.resolve(); @@ -1996,10 +1996,10 @@ deferred.resolve(); } }); - + file._info && image.info( file._info ); file._meta && image.meta( file._meta ); - + image.loadFromBlob( file.source ); return deferred.promise(); } @@ -2012,17 +2012,17 @@ 'base', 'mediator' ], function( Base, Mediator ) { - + var $ = Base.$, idPrefix = 'WU_FILE_', idSuffix = 0, rExt = /\.([^.]+)$/, statusMap = {}; - + function gid() { return idPrefix + idSuffix++; } - + /** * 文件类 * @class File @@ -2031,14 +2031,14 @@ * @param {Lib.File} source [lib.File](#Lib.File)实例, 此source对象是带有Runtime信息的。 */ function WUFile( source ) { - + /** * 文件名，包括扩展名（后缀） * @property name * @type {string} */ this.name = source.name || 'Untitled'; - + /** * 文件体积（字节） * @property size @@ -2046,7 +2046,7 @@ * @default 0 */ this.size = source.size || 0; - + /** * 文件MIMETYPE类型，与文件类型的对应关系请参考[http://t.cn/z8ZnFny](http://t.cn/z8ZnFny) * @property type @@ -2054,7 +2054,7 @@ * @default 'application' */ this.type = source.type || 'application'; - + /** * 文件最后修改日期 * @property lastModifiedDate @@ -2062,42 +2062,42 @@ * @default 当前时间戳 */ this.lastModifiedDate = source.lastModifiedDate || (new Date() * 1); - + /** * 文件ID，每个对象具有唯一ID，与文件名无关 * @property id * @type {string} */ this.id = gid(); - + /** * 文件扩展名，通过文件名获取，例如test.png的扩展名为png * @property ext * @type {string} */ this.ext = rExt.exec( this.name ) ? RegExp.$1 : ''; - - + + /** * 状态文字说明。在不同的status语境下有不同的用途。 * @property statusText * @type {string} */ this.statusText = ''; - + // 存储文件状态，防止通过属性直接修改 statusMap[ this.id ] = WUFile.Status.INITED; - + this.source = source; this.loaded = 0; - + this.on( 'error', function( msg ) { this.setStatus( WUFile.Status.ERROR, msg ); }); } - + $.extend( WUFile.prototype, { - + /** * 设置状态，状态变化时会触发`change`事件。 * @method setStatus @@ -2106,11 +2106,11 @@ * @param {String} [statusText=''] 状态说明，常在error时使用，用http, abort,server等来标记是由于什么原因导致文件错误。 */ setStatus: function( status, text ) { - + var prevStatus = statusMap[ this.id ]; - + typeof text !== 'undefined' && (this.statusText = text); - + if ( status !== prevStatus ) { statusMap[ this.id ] = status; /** @@ -2119,9 +2119,9 @@ */ this.trigger( 'statuschange', status, prevStatus ); } - + }, - + /** * 获取文件状态 * @return {File.Status} @@ -2145,7 +2145,7 @@ getStatus: function() { return statusMap[ this.id ]; }, - + /** * 获取文件原始信息。 * @return {*} @@ -2153,14 +2153,14 @@ getSource: function() { return this.source; }, - + destory: function() { delete statusMap[ this.id ]; } }); - + Mediator.installTo( WUFile.prototype ); - + /** * 文件状态值，具体包括以下几种类型： * * `inited` 初始状态 @@ -2186,10 +2186,10 @@ INTERRUPT: 'interrupt', // 上传中断，可续传。 INVALID: 'invalid' // 文件不合格，不能重试上传。 }; - + return WUFile; }); - + /** * @fileOverview 文件队列 */ @@ -2198,17 +2198,17 @@ 'mediator', 'file' ], function( Base, Mediator, WUFile ) { - + var $ = Base.$, STATUS = WUFile.Status; - + /** * 文件队列, 用来存储各个状态中的文件。 * @class Queue * @extends Mediator */ function Queue() { - + /** * 统计文件数。 * * `numOfQueue` 队列中的文件数。 @@ -2227,16 +2227,16 @@ numOfUploadFailed: 0, numOfInvalid: 0 }; - + // 上传队列，仅包括等待上传的文件 this._queue = []; - + // 存储所有文件 this._map = {}; } - + $.extend( Queue.prototype, { - + /** * 将新文件加入对队列尾部 * @@ -2248,7 +2248,7 @@ this._fileAdded( file ); return this; }, - + /** * 将新文件加入对队列头部 * @@ -2260,7 +2260,7 @@ this._fileAdded( file ); return this; }, - + /** * 获取文件对象 * @@ -2274,7 +2274,7 @@ } return this._map[ fileId ]; }, - + /** * 从队列中取出一个指定状态的文件。 * @grammar fetch( status ) => File @@ -2285,20 +2285,20 @@ fetch: function( status ) { var len = this._queue.length, i, file; - + status = status || STATUS.QUEUED; - + for ( i = 0; i < len; i++ ) { file = this._queue[ i ]; - + if ( status === file.getStatus() ) { return file; } } - + return null; }, - + /** * 对队列进行排序，能够控制文件上传顺序。 * @grammar sort( fn ) => undefined @@ -2310,7 +2310,7 @@ this._queue.sort( fn ); } }, - + /** * 获取指定类型的文件列表, 列表中每一个成员为[File](#WebUploader:File)对象。 * @grammar getFiles( [status1[, status2 ...]] ) => Array @@ -2323,87 +2323,87 @@ i = 0, len = this._queue.length, file; - + for ( ; i < len; i++ ) { file = this._queue[ i ]; - + if ( sts.length && !~$.inArray( file.getStatus(), sts ) ) { continue; } - + ret.push( file ); } - + return ret; }, - + _fileAdded: function( file ) { var me = this, existing = this._map[ file.id ]; - + if ( !existing ) { this._map[ file.id ] = file; - + file.on( 'statuschange', function( cur, pre ) { me._onFileStatusChange( cur, pre ); }); } - + file.setStatus( STATUS.QUEUED ); }, - + _onFileStatusChange: function( curStatus, preStatus ) { var stats = this.stats; - + switch ( preStatus ) { case STATUS.PROGRESS: stats.numOfProgress--; break; - + case STATUS.QUEUED: stats.numOfQueue --; break; - + case STATUS.ERROR: stats.numOfUploadFailed--; break; - + case STATUS.INVALID: stats.numOfInvalid--; break; } - + switch ( curStatus ) { case STATUS.QUEUED: stats.numOfQueue++; break; - + case STATUS.PROGRESS: stats.numOfProgress++; break; - + case STATUS.ERROR: stats.numOfUploadFailed++; break; - + case STATUS.COMPLETE: stats.numOfSuccess++; break; - + case STATUS.CANCELLED: stats.numOfCancel++; break; - + case STATUS.INVALID: stats.numOfInvalid++; break; } } - + }); - + Mediator.installTo( Queue.prototype ); - + return Queue; }); /** @@ -2418,11 +2418,11 @@ 'runtime/client', 'widgets/widget' ], function( Base, Uploader, Queue, WUFile, File, RuntimeClient ) { - + var $ = Base.$, rExt = /\.\w+$/, Status = WUFile.Status; - + return Uploader.register({ 'sort-files': 'sortFiles', 'add-file': 'addFiles', @@ -2435,42 +2435,42 @@ 'reset': 'reset', 'accept-file': 'acceptFile' }, { - + init: function( opts ) { var me = this, deferred, len, i, item, arr, accept, runtime; - + if ( $.isPlainObject( opts.accept ) ) { opts.accept = [ opts.accept ]; } - + // accept中的中生成匹配正则。 if ( opts.accept ) { arr = []; - + for ( i = 0, len = opts.accept.length; i < len; i++ ) { item = opts.accept[ i ].extensions; item && arr.push( item ); } - + if ( arr.length ) { accept = '\\.' + arr.join(',') .replace( /,/g, '$|\\.' ) .replace( /\*/g, '.*' ) + '$'; } - + me.accept = new RegExp( accept, 'i' ); } - + me.queue = new Queue(); me.stats = me.queue.stats; - + // 如果当前不是html5运行时，那就算了。 // 不执行后续操作 if ( this.request('predict-runtime-type') !== 'html5' ) { return; } - + // 创建一个 html5 运行时的 placeholder // 以至于外部添加原生 File 对象的时候能正确包裹一下供 webuploader 使用。 deferred = Base.Deferred(); @@ -2483,82 +2483,82 @@ }); return deferred.promise(); }, - - + + // 为了支持外部直接添加一个原生File对象。 _wrapFile: function( file ) { if ( !(file instanceof WUFile) ) { - + if ( !(file instanceof File) ) { if ( !this._ruid ) { throw new Error('Can\'t add external files.'); } file = new File( this._ruid, file ); } - + file = new WUFile( file ); } - + return file; }, - + // 判断文件是否可以被加入队列 acceptFile: function( file ) { var invalid = !file || file.size < 6 || this.accept && - + // 如果名字中有后缀，才做后缀白名单处理。 rExt.exec( file.name ) && !this.accept.test( file.name ); - + return !invalid; }, - - + + /** * @event beforeFileQueued * @param {File} file File对象 * @description 当文件被加入队列之前触发，此事件的handler返回值为`false`，则此文件不会被添加进入队列。 * @for Uploader */ - + /** * @event fileQueued * @param {File} file File对象 * @description 当文件被加入队列以后触发。 * @for Uploader */ - + _addFile: function( file ) { var me = this; - + file = me._wrapFile( file ); - + // 不过类型判断允许不允许，先派送 `beforeFileQueued` if ( !me.owner.trigger( 'beforeFileQueued', file ) ) { return; } - + // 类型不匹配，则派送错误事件，并返回。 if ( !me.acceptFile( file ) ) { me.owner.trigger( 'error', 'Q_TYPE_DENIED', file ); return; } - + me.queue.append( file ); me.owner.trigger( 'fileQueued', file ); return file; }, - + getFile: function( fileId ) { return this.queue.getFile( fileId ); }, - + /** * @event filesQueued * @param {File} files 数组，内容为原始File(lib/File）对象。 * @description 当一批文件添加进队列以后触发。 * @for Uploader */ - + /** * @method addFiles * @grammar addFiles( file ) => undefined @@ -2569,33 +2569,33 @@ */ addFiles: function( files ) { var me = this; - + if ( !files.length ) { files = [ files ]; } - + files = $.map( files, function( file ) { return me._addFile( file ); }); - + me.owner.trigger( 'filesQueued', files ); - + if ( me.options.auto ) { me.request('start-upload'); } }, - + getStats: function() { return this.stats; }, - + /** * @event fileDequeued * @param {File} file File对象 * @description 当文件被移除队列后触发。 * @for Uploader */ - + /** * @method removeFile * @grammar removeFile( file ) => undefined @@ -2611,13 +2611,13 @@ */ removeFile: function( file ) { var me = this; - + file = file.id ? file : me.queue.getFile( file ); - + file.setStatus( Status.CANCELLED ); me.owner.trigger( 'fileDequeued', file ); }, - + /** * @method getFiles * @grammar getFiles() => Array @@ -2631,11 +2631,11 @@ getFiles: function() { return this.queue.getFiles.apply( this.queue, arguments ); }, - + fetchFile: function() { return this.queue.fetch.apply( this.queue, arguments ); }, - + /** * @method retry * @grammar retry() => undefined @@ -2650,26 +2650,26 @@ retry: function( file, noForceStart ) { var me = this, files, i, len; - + if ( file ) { file = file.id ? file : me.queue.getFile( file ); file.setStatus( Status.QUEUED ); noForceStart || me.request('start-upload'); return; } - + files = me.queue.getFiles( Status.ERROR ); i = 0; len = files.length; - + for ( ; i < len; i++ ) { file = files[ i ]; file.setStatus( Status.QUEUED ); } - + me.request('start-upload'); }, - + /** * @method sort * @grammar sort( fn ) => undefined @@ -2679,7 +2679,7 @@ sortFiles: function() { return this.queue.sort.apply( this.queue, arguments ); }, - + /** * @method reset * @grammar reset() => undefined @@ -2693,7 +2693,7 @@ this.stats = this.queue.stats; } }); - + }); /** * @fileOverview 添加获取Runtime相关信息的方法。 @@ -2703,21 +2703,21 @@ 'runtime/runtime', 'widgets/widget' ], function( Uploader, Runtime ) { - + Uploader.support = function() { return Runtime.hasRuntime.apply( Runtime, arguments ); }; - + return Uploader.register({ 'predict-runtime-type': 'predictRuntmeType' }, { - + init: function() { if ( !this.predictRuntmeType() ) { throw Error('Runtime Error'); } }, - + /** * 预测Uploader将采用哪个`Runtime` * @grammar predictRuntmeType() => String @@ -2728,10 +2728,10 @@ var orders = this.options.runtimeOrder || Runtime.orders, type = this.type, i, len; - + if ( !type ) { orders = orders.split( /\s*,\s*/g ); - + for ( i = 0, len = orders.length; i < len; i++ ) { if ( Runtime.hasRuntime( orders[ i ] ) ) { this.type = type = orders[ i ]; @@ -2739,7 +2739,7 @@ } } } - + return type; } }); @@ -2752,30 +2752,30 @@ 'runtime/client', 'mediator' ], function( Base, RuntimeClient, Mediator ) { - + var $ = Base.$; - + function Transport( opts ) { var me = this; - + opts = me.options = $.extend( true, {}, Transport.options, opts || {} ); RuntimeClient.call( this, 'Transport' ); - + this._blob = null; this._formData = opts.formData || {}; this._headers = opts.headers || {}; - + this.on( 'progress', this._timeout ); this.on( 'load error', function() { me.trigger( 'progress', 1 ); clearTimeout( me._timer ); }); } - + Transport.options = { server: '', method: 'POST', - + // 跨域时，是否允许携带cookie, 只有html5 runtime才有效 withCredentials: false, fileVal: 'file', @@ -2784,28 +2784,28 @@ headers: {}, sendAsBinary: false }; - + $.extend( Transport.prototype, { - + // 添加Blob, 只能添加一次，最后一次有效。 appendBlob: function( key, blob, filename ) { var me = this, opts = me.options; - + if ( me.getRuid() ) { me.disconnectRuntime(); } - + // 连接到blob归属的同一个runtime. me.connectRuntime( blob.ruid, function() { me.exec('init'); }); - + me._blob = blob; opts.fileVal = key || opts.fileVal; opts.filename = filename || opts.filename; }, - + // 添加其他字段 append: function( key, value ) { if ( typeof key === 'object' ) { @@ -2814,7 +2814,7 @@ this._formData[ key ] = value; } }, - + setRequestHeader: function( key, value ) { if ( typeof key === 'object' ) { $.extend( this._headers, key ); @@ -2822,56 +2822,56 @@ this._headers[ key ] = value; } }, - + send: function( method ) { this.exec( 'send', method ); this._timeout(); }, - + abort: function() { clearTimeout( this._timer ); return this.exec('abort'); }, - + destroy: function() { this.trigger('destroy'); this.off(); this.exec('destroy'); this.disconnectRuntime(); }, - + getResponse: function() { return this.exec('getResponse'); }, - + getResponseAsJson: function() { return this.exec('getResponseAsJson'); }, - + getStatus: function() { return this.exec('getStatus'); }, - + _timeout: function() { var me = this, duration = me.options.timeout; - + if ( !duration ) { return; } - + clearTimeout( me._timer ); me._timer = setTimeout(function() { me.abort(); me.trigger( 'error', 'timeout' ); }, duration ); } - + }); - + // 让Transport具备事件功能。 Mediator.installTo( Transport.prototype ); - + return Transport; }); /** @@ -2884,15 +2884,15 @@ 'lib/transport', 'widgets/widget' ], function( Base, Uploader, WUFile, Transport ) { - + var $ = Base.$, isPromise = Base.isPromise, Status = WUFile.Status; - + // 添加默认配置项 $.extend( Uploader.options, { - - + + /** * @property {Boolean} [prepareNextFile=false] * @namespace options @@ -2902,7 +2902,7 @@ * 如果能提前在当前文件传输期处理，可以节省总体耗时。 */ prepareNextFile: false, - + /** * @property {Boolean} [chunked=false] * @namespace options @@ -2910,7 +2910,7 @@ * @description 是否要分片处理大文件上传。 */ chunked: false, - + /** * @property {Boolean} [chunkSize=5242880] * @namespace options @@ -2918,7 +2918,7 @@ * @description 如果要分片，分多大一片？ 默认大小为5M. */ chunkSize: 5 * 1024 * 1024, - + /** * @property {Boolean} [chunkRetry=2] * @namespace options @@ -2926,7 +2926,7 @@ * @description 如果某个分片由于网络问题出错，允许自动重传多少次？ */ chunkRetry: 2, - + /** * @property {Boolean} [threads=3] * @namespace options @@ -2934,8 +2934,8 @@ * @description 上传并发数。允许同时最大上传进程数。 */ threads: 3, - - + + /** * @property {Object} [formData] * @namespace options @@ -2943,21 +2943,21 @@ * @description 文件上传请求的参数表，每次发送都会发送此对象中的参数。 */ formData: null - + /** * @property {Object} [fileVal='file'] * @namespace options * @for Uploader * @description 设置文件上传域的name。 */ - + /** * @property {Object} [method='POST'] * @namespace options * @for Uploader * @description 文件上传方式，`POST`或者`GET`。 */ - + /** * @property {Object} [sendAsBinary=false] * @namespace options @@ -2966,7 +2966,7 @@ * 其他参数在$_GET数组中。 */ }); - + // 负责将文件切片。 function CuteFile( file, chunkSize ) { var pending = [], @@ -2976,10 +2976,10 @@ start = 0, index = 0, len; - + while ( index < chunks ) { len = Math.min( chunkSize, total - start ); - + pending.push({ file: file, start: start, @@ -2990,63 +2990,63 @@ }); start += len; } - + file.blocks = pending.concat(); file.remaning = pending.length; - + return { file: file, - + has: function() { return !!pending.length; }, - + fetch: function() { return pending.shift(); } }; } - + Uploader.register({ 'start-upload': 'start', 'stop-upload': 'stop', 'skip-file': 'skipFile', 'is-in-progress': 'isInProgress' }, { - + init: function() { var owner = this.owner; - + this.runing = false; - + // 记录当前正在传的数据，跟threads相关 this.pool = []; - + // 缓存即将上传的文件。 this.pending = []; - + // 跟踪还有多少分片没有完成上传。 this.remaning = 0; this.__tick = Base.bindFn( this._tick, this ); - + owner.on( 'uploadComplete', function( file ) { // 把其他块取消了。 file.blocks && $.each( file.blocks, function( _, v ) { v.transport && (v.transport.abort(), v.transport.destroy()); delete v.transport; }); - + delete file.blocks; delete file.remaning; }); }, - + /** * @event startUpload * @description 当开始上传流程时触发。 * @for Uploader */ - + /** * 开始上传。此方法可以从初始状态调用开始上传流程，也可以从暂停状态调用，继续上传流程。 * @grammar upload() => undefined @@ -3055,40 +3055,40 @@ */ start: function() { var me = this; - + // 移出invalid的文件 $.each( me.request( 'get-files', Status.INVALID ), function() { me.request( 'remove-file', this ); }); - + if ( me.runing ) { return; } - + me.runing = true; - + // 如果有暂停的，则续传 $.each( me.pool, function( _, v ) { var file = v.file; - + if ( file.getStatus() === Status.INTERRUPT ) { file.setStatus( Status.PROGRESS ); me._trigged = false; v.transport && v.transport.send(); } }); - + me._trigged = false; me.owner.trigger('startUpload'); Base.nextTick( me.__tick ); }, - + /** * @event stopUpload * @description 当开始上传流程暂停时触发。 * @for Uploader */ - + /** * 暂停上传。第一个参数为是否中断上传当前正在上传的文件。 * @grammar stop() => undefined @@ -3098,21 +3098,21 @@ */ stop: function( interrupt ) { var me = this; - + if ( me.runing === false ) { return; } - + me.runing = false; - + interrupt && $.each( me.pool, function( _, v ) { v.transport && v.transport.abort(); v.file.setStatus( Status.INTERRUPT ); }); - + me.owner.trigger('stopUpload'); }, - + /** * 判断`Uplaode`r是否正在上传中。 * @grammar isInProgress() => Boolean @@ -3122,11 +3122,11 @@ isInProgress: function() { return !!this.runing; }, - + getStats: function() { return this.request('get-stats'); }, - + /** * 掉过一个文件上传，直接标记指定文件为已上传状态。 * @grammar skipFile( file ) => undefined @@ -3135,24 +3135,24 @@ */ skipFile: function( file, status ) { file = this.request( 'get-file', file ); - + file.setStatus( status || Status.COMPLETE ); file.skipped = true; - + // 如果正在上传。 file.blocks && $.each( file.blocks, function( _, v ) { var _tr = v.transport; - + if ( _tr ) { _tr.abort(); _tr.destroy(); delete v.transport; } }); - + this.owner.trigger( 'uploadSkip', file ); }, - + /** * @event uploadFinished * @description 当所有文件上传结束时触发。 @@ -3162,81 +3162,81 @@ var me = this, opts = me.options, fn, val; - + // 上一个promise还没有结束，则等待完成后再执行。 if ( me._promise ) { return me._promise.always( me.__tick ); } - + // 还有位置，且还有文件要处理的话。 if ( me.pool.length < opts.threads && (val = me._nextBlock()) ) { me._trigged = false; - + fn = function( val ) { me._promise = null; - + // 有可能是reject过来的，所以要检测val的类型。 val && val.file && me._startSend( val ); Base.nextTick( me.__tick ); }; - + me._promise = isPromise( val ) ? val.always( fn ) : fn( val ); - + // 没有要上传的了，且没有正在传输的了。 } else if ( !me.remaning && !me.getStats().numOfQueue ) { me.runing = false; - + me._trigged || Base.nextTick(function() { me.owner.trigger('uploadFinished'); }); me._trigged = true; } }, - + _nextBlock: function() { var me = this, act = me._act, opts = me.options, next, done; - + // 如果当前文件还有没有需要传输的，则直接返回剩下的。 if ( act && act.has() && act.file.getStatus() === Status.PROGRESS ) { - + // 是否提前准备下一个文件 if ( opts.prepareNextFile && !me.pending.length ) { me._prepareNextFile(); } - + return act.fetch(); - + // 否则，如果正在运行，则准备下一个文件，并等待完成后返回下个分片。 } else if ( me.runing ) { - + // 如果缓存中有，则直接在缓存中取，没有则去queue中取。 if ( !me.pending.length && me.getStats().numOfQueue ) { me._prepareNextFile(); } - + next = me.pending.shift(); done = function( file ) { if ( !file ) { return null; } - + act = CuteFile( file, opts.chunked ? opts.chunkSize : 0 ); me._act = act; return act.fetch(); }; - + // 文件可能还在prepare中，也有可能已经完全准备好了。 return isPromise( next ) ? next[ next.pipe ? 'pipe' : 'then']( done ) : done( next ); } }, - - + + /** * @event uploadStart * @param {File} file File对象 @@ -3248,64 +3248,64 @@ file = me.request('fetch-file'), pending = me.pending, promise; - + if ( file ) { promise = me.request( 'before-send-file', file, function() { - + // 有可能文件被skip掉了。文件被skip掉后，状态坑定不是Queued. if ( file.getStatus() === Status.QUEUED ) { me.owner.trigger( 'uploadStart', file ); file.setStatus( Status.PROGRESS ); return file; } - + return me._finishFile( file ); }); - + // 如果还在pending中，则替换成文件本身。 promise.done(function() { var idx = $.inArray( promise, pending ); - + ~idx && pending.splice( idx, 1, file ); }); - + // befeore-send-file的钩子就有错误发生。 promise.fail(function( reason ) { file.setStatus( Status.ERROR, reason ); me.owner.trigger( 'uploadError', file, reason ); me.owner.trigger( 'uploadComplete', file ); }); - + pending.push( promise ); } }, - + // 让出位置了，可以让其他分片开始上传 _popBlock: function( block ) { var idx = $.inArray( block, this.pool ); - + this.pool.splice( idx, 1 ); block.file.remaning--; this.remaning--; }, - + // 开始上传，可以被掉过。如果promise被reject了，则表示跳过此分片。 _startSend: function( block ) { var me = this, file = block.file, promise; - + me.pool.push( block ); me.remaning++; - + // 如果没有分片，则直接使用原始的。 // 不会丢失content-type信息。 block.blob = block.chunks === 1 ? file.source : file.source.slice( block.start, block.end ); - + // hook, 每个分片发送之前可能要做些异步的事情。 promise = me.request( 'before-send', block, function() { - + // 有可能文件已经上传出错了，所以不需要再传输了。 if ( file.getStatus() === Status.PROGRESS ) { me._doSend( block ); @@ -3314,7 +3314,7 @@ Base.nextTick( me.__tick ); } }); - + // 如果为fail了，则跳过此分片。 promise.fail(function() { if ( file.remaning === 1 ) { @@ -3331,8 +3331,8 @@ } }); }, - - + + /** * @event uploadBeforeSend * @param {Object} object @@ -3340,7 +3340,7 @@ * @description 当某个文件的分块在发送前触发，主要用来询问是否要添加附带参数，大文件在开起分片上传的前提下此事件可能会触发多次。 * @for Uploader */ - + /** * @event uploadAccept * @param {Object} object @@ -3348,7 +3348,7 @@ * @description 当某个文件上传到服务端响应后，会派送此事件来询问服务端响应是否有效。如果此事件handler返回值为`false`, 则此文件将派送`server`类型的`uploadError`事件。 * @for Uploader */ - + /** * @event uploadProgress * @param {File} file File对象 @@ -3356,8 +3356,8 @@ * @description 上传过程中触发，携带上传进度。 * @for Uploader */ - - + + /** * @event uploadError * @param {File} file File对象 @@ -3365,7 +3365,7 @@ * @description 当文件上传出错时触发。 * @for Uploader */ - + /** * @event uploadSuccess * @param {File} file File对象 @@ -3373,14 +3373,14 @@ * @description 当文件上传成功时触发。 * @for Uploader */ - + /** * @event uploadComplete * @param {File} [file] File对象 * @description 不管成功或者失败，文件上传完成时触发。 * @for Uploader */ - + // 做上传操作。 _doSend: function( block ) { var me = this, @@ -3391,90 +3391,90 @@ data = $.extend({}, opts.formData ), headers = $.extend({}, opts.headers ), requestAccept, ret; - + block.transport = tr; - + tr.on( 'destroy', function() { delete block.transport; me._popBlock( block ); Base.nextTick( me.__tick ); }); - + // 广播上传进度。以文件为单位。 tr.on( 'progress', function( percentage ) { var totalPercent = 0, uploaded = 0; - + // 可能没有abort掉，progress还是执行进来了。 // if ( !file.blocks ) { // return; // } - + totalPercent = block.percentage = percentage; - + if ( block.chunks > 1 ) { // 计算文件的整体速度。 $.each( file.blocks, function( _, v ) { uploaded += (v.percentage || 0) * (v.end - v.start); }); - + totalPercent = uploaded / file.size; } - + owner.trigger( 'uploadProgress', file, totalPercent || 0 ); }); - + // 用来询问，是否返回的结果是有错误的。 requestAccept = function( reject ) { var fn; - + ret = tr.getResponseAsJson() || {}; ret._raw = tr.getResponse(); fn = function( value ) { reject = value; }; - + // 服务端响应了，不代表成功了，询问是否响应正确。 if ( !owner.trigger( 'uploadAccept', block, ret, fn ) ) { reject = reject || 'server'; } - + return reject; }; - + // 尝试重试，然后广播文件上传出错。 tr.on( 'error', function( type, flag ) { block.retried = block.retried || 0; - + // 自动重试 if ( block.chunks > 1 && ~'http,abort'.indexOf( type ) && block.retried < opts.chunkRetry ) { - + block.retried++; tr.send(); - + } else { - + // http status 500 ~ 600 if ( !flag && type === 'server' ) { type = requestAccept( type ); } - + file.setStatus( Status.ERROR, type ); owner.trigger( 'uploadError', file, type ); owner.trigger( 'uploadComplete', file ); } }); - + // 上传成功 tr.on( 'load', function() { var reason; - + // 如果非预期，转向上传出错。 if ( (reason = requestAccept()) ) { tr.trigger( 'error', reason, true ); return; } - + // 全部上传完成。 if ( file.remaning === 1 ) { me._finishFile( file, ret ); @@ -3482,7 +3482,7 @@ tr.destroy(); } }); - + // 配置默认的上传字段。 data = $.extend( data, { id: file.id, @@ -3491,63 +3491,63 @@ lastModifiedDate: file.lastModifiedDate, size: file.size }); - + block.chunks > 1 && $.extend( data, { chunks: block.chunks, chunk: block.chunk }); - + // 在发送之间可以添加字段什么的。。。 // 如果默认的字段不够使用，可以通过监听此事件来扩展 owner.trigger( 'uploadBeforeSend', block, data, headers ); - + // 开始发送。 tr.appendBlob( opts.fileVal, block.blob, file.name ); tr.append( data ); tr.setRequestHeader( headers ); tr.send(); }, - + // 完成上传。 _finishFile: function( file, ret, hds ) { var owner = this.owner; - + return owner .request( 'after-send-file', arguments, function() { file.setStatus( Status.COMPLETE ); owner.trigger( 'uploadSuccess', file, ret, hds ); }) .fail(function( reason ) { - + // 如果外部已经标记为invalid什么的，不再改状态。 if ( file.getStatus() === Status.PROGRESS ) { file.setStatus( Status.ERROR, reason ); } - + owner.trigger( 'uploadError', file, reason ); }) .always(function() { owner.trigger( 'uploadComplete', file ); }); } - + }); }); /** * @fileOverview 各种验证，包括文件总大小是否超出、单文件是否超出和文件是否重复。 */ - + define('widgets/validator',[ 'base', 'uploader', 'file', 'widgets/widget' ], function( Base, Uploader, WUFile ) { - + var $ = Base.$, validators = {}, api; - + /** * @event error * @param {String} type 错误类型。 @@ -3557,21 +3557,21 @@ * * `Q_EXCEED_SIZE_LIMIT` 在设置了`Q_EXCEED_SIZE_LIMIT`且尝试给`uploader`添加的文件总大小超出这个值时派送。 * @for Uploader */ - + // 暴露给外面的api api = { - + // 添加验证器 addValidator: function( type, cb ) { validators[ type ] = cb; }, - + // 移除验证器 removeValidator: function( type ) { delete validators[ type ]; } }; - + // 在Uploader初始化的时候启动Validators的初始化 Uploader.register({ init: function() { @@ -3581,7 +3581,7 @@ }); } }); - + /** * @property {int} [fileNumLimit=undefined] * @namespace options @@ -3594,13 +3594,13 @@ count = 0, max = opts.fileNumLimit >> 0, flag = true; - + if ( !max ) { return; } - + uploader.on( 'beforeFileQueued', function( file ) { - + if ( count >= max && flag ) { flag = false; this.trigger( 'error', 'Q_EXCEED_NUM_LIMIT', max, file ); @@ -3608,24 +3608,24 @@ flag = true; }, 1 ); } - + return count >= max ? false : true; }); - + uploader.on( 'fileQueued', function() { count++; }); - + uploader.on( 'fileDequeued', function() { count--; }); - + uploader.on( 'uploadFinished', function() { count = 0; }); }); - - + + /** * @property {int} [fileSizeLimit=undefined] * @namespace options @@ -3638,14 +3638,14 @@ count = 0, max = opts.fileSizeLimit >> 0, flag = true; - + if ( !max ) { return; } - + uploader.on( 'beforeFileQueued', function( file ) { var invalid = count + file.size > max; - + if ( invalid && flag ) { flag = false; this.trigger( 'error', 'Q_EXCEED_SIZE_LIMIT', max, file ); @@ -3653,23 +3653,23 @@ flag = true; }, 1 ); } - + return invalid ? false : true; }); - + uploader.on( 'fileQueued', function( file ) { count += file.size; }); - + uploader.on( 'fileDequeued', function( file ) { count -= file.size; }); - + uploader.on( 'uploadFinished', function() { count = 0; }); }); - + /** * @property {int} [fileSingleSizeLimit=undefined] * @namespace options @@ -3680,23 +3680,23 @@ var uploader = this, opts = uploader.options, max = opts.fileSingleSizeLimit; - + if ( !max ) { return; } - + uploader.on( 'beforeFileQueued', function( file ) { - + if ( file.size > max ) { file.setStatus( WUFile.Status.INVALID, 'exceed_size' ); this.trigger( 'error', 'F_EXCEED_SIZE', file ); return false; } - + }); - + }); - + /** * @property {int} [duplicate=undefined] * @namespace options @@ -3707,75 +3707,75 @@ var uploader = this, opts = uploader.options, mapping = {}; - + if ( opts.duplicate ) { return; } - + function hashString( str ) { var hash = 0, i = 0, len = str.length, _char; - + for ( ; i < len; i++ ) { _char = str.charCodeAt( i ); hash = _char + (hash << 6) + (hash << 16) - hash; } - + return hash; } - + uploader.on( 'beforeFileQueued', function( file ) { var hash = file.__hash || (file.__hash = hashString( file.name + file.size + file.lastModifiedDate )); - + // 已经重复了 if ( mapping[ hash ] ) { this.trigger( 'error', 'F_DUPLICATE', file ); return false; } }); - + uploader.on( 'fileQueued', function( file ) { var hash = file.__hash; - + hash && (mapping[ hash ] = true); }); - + uploader.on( 'fileDequeued', function( file ) { var hash = file.__hash; - + hash && (delete mapping[ hash ]); }); }); - + return api; }); - + /** * @fileOverview Runtime管理器，负责Runtime的选择, 连接 */ define('runtime/compbase',[],function() { - + function CompBase( owner, runtime ) { - + this.owner = owner; this.options = owner.options; - + this.getRuntime = function() { return runtime; }; - + this.getRuid = function() { return runtime.uid; }; - + this.trigger = function() { return owner.trigger.apply( owner, arguments ); }; } - + return CompBase; }); /** @@ -3786,15 +3786,15 @@ 'runtime/runtime', 'runtime/compbase' ], function( Base, Runtime, CompBase ) { - + var $ = Base.$, type = 'flash', components = {}; - - + + function getFlashVersion() { var version; - + try { version = navigator.plugins[ 'Shockwave Flash' ]; version = version.description; @@ -3809,96 +3809,96 @@ version = version.match( /\d+/g ); return parseFloat( version[ 0 ] + '.' + version[ 1 ], 10 ); } - + function FlashRuntime() { var pool = {}, clients = {}, destory = this.destory, me = this, jsreciver = Base.guid('webuploader_'); - + Runtime.apply( me, arguments ); me.type = type; - - + + // 这个方法的调用者，实际上是RuntimeClient me.exec = function( comp, fn/*, args...*/ ) { var client = this, uid = client.uid, args = Base.slice( arguments, 2 ), instance; - + clients[ uid ] = client; - + if ( components[ comp ] ) { if ( !pool[ uid ] ) { pool[ uid ] = new components[ comp ]( client, me ); } - + instance = pool[ uid ]; - + if ( instance[ fn ] ) { return instance[ fn ].apply( instance, args ); } } - + return me.flashExec.apply( client, arguments ); }; - + function handler( evt, obj ) { var type = evt.type || evt, parts, uid; - + parts = type.split('::'); uid = parts[ 0 ]; type = parts[ 1 ]; - + // console.log.apply( console, arguments ); - + if ( type === 'Ready' && uid === me.uid ) { me.trigger('ready'); } else if ( clients[ uid ] ) { clients[ uid ].trigger( type.toLowerCase(), evt, obj ); } - + // Base.log( evt, obj ); } - + // flash的接受器。 window[ jsreciver ] = function() { var args = arguments; - + // 为了能捕获得到。 setTimeout(function() { handler.apply( null, args ); }, 1 ); }; - + this.jsreciver = jsreciver; - + this.destory = function() { // @todo 删除池子中的所有实例 return destory && destory.apply( this, arguments ); }; - + this.flashExec = function( comp, fn ) { var flash = me.getFlash(), args = Base.slice( arguments, 2 ); - + return flash.exec( this.uid, comp, fn, args ); }; - + // @todo } - + Base.inherits( Runtime, { constructor: FlashRuntime, - + init: function() { var container = this.getContainer(), opts = this.options, html; - + // if not the minimal height, shims are not initialized // in older browsers (e.g FF3.6, IE6,7,8, Safari 4.0,5.0, etc) container.css({ @@ -3909,15 +3909,15 @@ height: '9px', overflow: 'hidden' }); - + // insert flash object html = '' + '' + '' + ''; - + container.html( html ); }, - + getFlash: function() { if ( this._flash ) { return this._flash; } - + this._flash = $( '#' + this.uid ).get( 0 ); return this._flash; } - + }); - + FlashRuntime.register = function( name, component ) { component = components[ name ] = Base.inherits( CompBase, $.extend({ - + // @todo fix this later flashExec: function() { var owner = this.owner, runtime = this.getRuntime(); - + return runtime.flashExec.apply( owner, arguments ); } }, component ) ); - + return component; }; - + if ( getFlashVersion() >= 11.4 ) { Runtime.addRuntime( type, FlashRuntime ); } - + return FlashRuntime; }); /** @@ -3969,12 +3969,12 @@ 'runtime/flash/runtime' ], function( Base, FlashRuntime ) { var $ = Base.$; - + return FlashRuntime.register( 'FilePicker', { init: function( opts ) { var copy = $.extend({}, opts ), len, i; - + // 修复Flash再没有设置title的情况下无法弹出flash文件选择框的bug. len = copy.accept && copy.accept.length; for ( i = 0; i < len; i++ ) { @@ -3982,13 +3982,13 @@ copy.accept[ i ].title = 'Files'; } } - + delete copy.button; delete copy.container; - + this.flashExec( 'FilePicker', 'init', copy ); }, - + destroy: function() { // todo } @@ -4000,23 +4000,23 @@ define('runtime/flash/image',[ 'runtime/flash/runtime' ], function( FlashRuntime ) { - + return FlashRuntime.register( 'Image', { // init: function( options ) { // var owner = this.owner; - + // this.flashExec( 'Image', 'init', options ); // owner.on( 'load', function() { - // debugger; + // ; // }); // }, - + loadFromBlob: function( blob ) { var owner = this.owner; - + owner.info() && this.flashExec( 'Image', 'info', owner.info() ); owner.meta() && this.flashExec( 'Image', 'meta', owner.meta() ); - + this.flashExec( 'Image', 'loadFromBlob', blob.uid ); } }); @@ -4030,14 +4030,14 @@ 'runtime/client' ], function( Base, FlashRuntime, RuntimeClient ) { var $ = Base.$; - + return FlashRuntime.register( 'Transport', { init: function() { this._status = 0; this._response = null; this._responseJson = null; }, - + send: function() { var owner = this.owner, opts = this.options, @@ -4045,71 +4045,71 @@ blob = owner._blob, server = opts.server, binary; - + xhr.connectRuntime( blob.ruid ); - + if ( opts.sendAsBinary ) { server += (/\?/.test( server ) ? '&' : '?') + $.param( owner._formData ); - + binary = blob.uid; } else { $.each( owner._formData, function( k, v ) { xhr.exec( 'append', k, v ); }); - + xhr.exec( 'appendBlob', opts.fileVal, blob.uid, opts.filename || owner._formData.name || '' ); } - + this._setRequestHeader( xhr, opts.headers ); xhr.exec( 'send', { method: opts.method, url: server }, binary ); }, - + getStatus: function() { return this._status; }, - + getResponse: function() { return this._response; }, - + getResponseAsJson: function() { return this._responseJson; }, - + abort: function() { var xhr = this._xhr; - + if ( xhr ) { xhr.exec('abort'); xhr.destroy(); this._xhr = xhr = null; } }, - + destroy: function() { this.abort(); }, - + _initAjax: function() { var me = this, xhr = new RuntimeClient('XMLHttpRequest'); - + xhr.on( 'uploadprogress progress', function( e ) { return me.trigger( 'progress', e.loaded / e.total ); }); - + xhr.on( 'load', function() { var status = xhr.exec('getStatus'), err = ''; - + xhr.off(); me._xhr = null; - + if ( status >= 200 && status < 300 ) { me._response = xhr.exec('getResponse'); me._responseJson = xhr.exec('getResponseAsJson'); @@ -4120,23 +4120,23 @@ } else { err = 'http'; } - + xhr.destroy(); xhr = null; - + return err ? me.trigger( 'error', err ) : me.trigger('load'); }); - + xhr.on( 'error', function() { xhr.off(); me._xhr = null; me.trigger( 'error', 'http' ); }); - + me._xhr = xhr; return xhr; }, - + _setRequestHeader: function( xhr, headers ) { $.each( headers, function( key, val ) { xhr.exec( 'setRequestHeader', key, val ); @@ -4149,7 +4149,7 @@ */ define('preset/flashonly',[ 'base', - + // widgets 'widgets/filepicker', 'widgets/image', @@ -4157,9 +4157,9 @@ 'widgets/runtime', 'widgets/upload', 'widgets/validator', - + // runtimes - + // flash 'runtime/flash/filepicker', 'runtime/flash/image', diff --git a/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.js b/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.js index 39d9351..e37d1a9 100644 --- a/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.js +++ b/base-vue/static/plugins/ueditor-1.4.3.3/third-party/webuploader/webuploader.js @@ -147,7 +147,7 @@ return { Deferred: $.Deferred, when: $.when, - + isPromise: function( anything ) { return anything && typeof anything.then === 'function'; } @@ -164,7 +164,7 @@ /** * @fileOverview 基础类方法。 */ - + /** * Web Uploader内部类的详细说明，以下提及的功能类，都可以在`WebUploader`这个变量中访问到。 * @@ -185,10 +185,10 @@ 'dollar', 'promise' ], function( $, promise ) { - + var noop = function() {}, call = Function.call; - + // http://jsperf.com/uncurrythis // 反科里化 function uncurryThis( fn ) { @@ -196,16 +196,16 @@ return call.apply( fn, arguments ); }; } - + function bindFn( fn, context ) { return function() { return fn.apply( context, arguments ); }; } - + function createObject( proto ) { var f; - + if ( Object.create ) { return Object.create( proto ); } else { @@ -214,30 +214,30 @@ return new f(); } } - - + + /** * 基础类，提供一些简单常用的方法。 * @class Base */ return { - + /** * @property {String} version 当前版本号。 */ version: '0.1.2', - + /** * @property {jQuery|Zepto} $ 引用依赖的jQuery或者Zepto对象。 */ $: $, - + Deferred: promise.Deferred, - + isPromise: promise.isPromise, - + when: promise.when, - + /** * @description 简单的浏览器检查结果。 * @@ -255,23 +255,23 @@ webkit = ua.match( /WebKit\/([\d.]+)/ ), chrome = ua.match( /Chrome\/([\d.]+)/ ) || ua.match( /CriOS\/([\d.]+)/ ), - + ie = ua.match( /MSIE\s([\d\.]+)/ ) || ua.match(/(?:trident)(?:.*rv:([\w.]+))?/i), firefox = ua.match( /Firefox\/([\d.]+)/ ), safari = ua.match( /Safari\/([\d.]+)/ ), opera = ua.match( /OPR\/([\d.]+)/ ); - + webkit && (ret.webkit = parseFloat( webkit[ 1 ] )); chrome && (ret.chrome = parseFloat( chrome[ 1 ] )); ie && (ret.ie = parseFloat( ie[ 1 ] )); firefox && (ret.firefox = parseFloat( firefox[ 1 ] )); safari && (ret.safari = parseFloat( safari[ 1 ] )); opera && (ret.opera = parseFloat( opera[ 1 ] )); - + return ret; })( navigator.userAgent ), - + /** * @description 操作系统检查结果。 * @@ -281,18 +281,18 @@ */ os: (function( ua ) { var ret = {}, - + // osx = !!ua.match( /\(Macintosh\; Intel / ), android = ua.match( /(?:Android);?[\s\/]+([\d.]+)?/ ), ios = ua.match( /(?:iPad|iPod|iPhone).*OS\s([\d_]+)/ ); - + // osx && (ret.osx = true); android && (ret.android = parseFloat( android[ 1 ] )); ios && (ret.ios = parseFloat( ios[ 1 ].replace( /_/g, '.' ) )); - + return ret; })( navigator.userAgent ), - + /** * 实现类与类之间的继承。 * @method inherits @@ -330,7 +330,7 @@ */ inherits: function( Super, protos, staticProtos ) { var child; - + if ( typeof protos === 'function' ) { child = protos; protos = null; @@ -341,29 +341,29 @@ return Super.apply( this, arguments ); }; } - + // 复制静态方法 $.extend( true, child, Super, staticProtos || {} ); - + /* jshint camelcase: false */ - + // 让子类的__super__属性指向父类。 child.__super__ = Super.prototype; - + // 构建原型，添加原型方法或属性。 // 暂时用Object.create实现。 child.prototype = createObject( Super.prototype ); protos && $.extend( true, child.prototype, protos ); - + return child; }, - + /** * 一个不做任何事情的方法。可以用来赋值给默认的callback. * @method noop */ noop: noop, - + /** * 返回一个新的方法，此方法将已指定的`context`来执行。 * @grammar Base.bindFn( fn, context ) => Function @@ -381,7 +381,7 @@ * */ bindFn: bindFn, - + /** * 引用Console.log如果存在的话，否则引用一个[空函数loop](#WebUploader:Base.log)。 * @grammar Base.log( args... ) => undefined @@ -393,13 +393,13 @@ } return noop; })(), - + nextTick: (function() { - + return function( cb ) { setTimeout( cb, 1 ); }; - + // @bug 当浏览器不在当前窗口时就停了。 // var next = window.requestAnimationFrame || // window.webkitRequestAnimationFrame || @@ -407,11 +407,11 @@ // function( cb ) { // window.setTimeout( cb, 1000 / 60 ); // }; - + // // fix: Uncaught TypeError: Illegal invocation // return bindFn( next, window ); })(), - + /** * 被[uncurrythis](http://www.2ality.com/2011/11/uncurrying-this.html)的数组slice方法。 * 将用来将非数组对象转化成数组对象。 @@ -426,7 +426,7 @@ * doSomthing( 'ignored', 'arg2', 'arg3' ); // => Array ["arg2", "arg3"] */ slice: uncurryThis( [].slice ), - + /** * 生成唯一的ID * @method guid @@ -435,19 +435,19 @@ */ guid: (function() { var counter = 0; - + return function( prefix ) { var guid = (+new Date()).toString( 32 ), i = 0; - + for ( ; i < 5; i++ ) { guid += Math.floor( Math.random() * 65535 ).toString( 32 ); } - + return (prefix || 'wu_') + guid + (counter++).toString( 32 ); }; })(), - + /** * 格式化文件大小, 输出成带单位的字符串 * @method formatSize @@ -467,13 +467,13 @@ */ formatSize: function( size, pointLength, units ) { var unit; - + units = units || [ 'B', 'K', 'M', 'G', 'TB' ]; - + while ( (unit = units.shift()) && size > 1024 ) { size = size / 1024; } - + return (unit === 'B' ? size : size.toFixed( pointLength || 2 )) + unit; } @@ -490,7 +490,7 @@ slice = [].slice, separator = /\s+/, protos; - + // 根据条件过滤出事件handlers. function findHandlers( arr, name, callback, context ) { return $.grep( arr, function( handler ) { @@ -501,34 +501,34 @@ (!context || handler.ctx === context); }); } - + function eachEvent( events, callback, iterator ) { // 不支持对象，只支持多个event用空格隔开 $.each( (events || '').split( separator ), function( _, key ) { iterator( key, callback ); }); } - + function triggerHanders( events, args ) { var stoped = false, i = -1, len = events.length, handler; - + while ( ++i < len ) { handler = events[ i ]; - + if ( handler.cb.apply( handler.ctx2, args ) === false ) { stoped = true; break; } } - + return !stoped; } - + protos = { - + /** * 绑定事件。 * @@ -569,27 +569,27 @@ on: function( name, callback, context ) { var me = this, set; - + if ( !callback ) { return this; } - + set = this._events || (this._events = []); - + eachEvent( name, callback, function( name, callback ) { var handler = { e: name }; - + handler.cb = callback; handler.ctx = context; handler.ctx2 = context || me; handler.id = set.length; - + set.push( handler ); }); - + return this; }, - + /** * 绑定事件，且当handler执行完后，自动解除绑定。 * @method once @@ -602,24 +602,24 @@ */ once: function( name, callback, context ) { var me = this; - + if ( !callback ) { return me; } - + eachEvent( name, callback, function( name, callback ) { var once = function() { me.off( name, once ); return callback.apply( context || me, arguments ); }; - + once._cb = callback; me.on( name, once, context ); }); - + return me; }, - + /** * 解除事件绑定 * @method off @@ -632,25 +632,25 @@ */ off: function( name, cb, ctx ) { var events = this._events; - + if ( !events ) { return this; } - + if ( !name && !cb && !ctx ) { this._events = []; return this; } - + eachEvent( name, cb, function( name, cb ) { $.each( findHandlers( events, name, cb, ctx ), function() { delete events[ this.id ]; }); }); - + return this; }, - + /** * 触发事件 * @method trigger @@ -661,20 +661,20 @@ */ trigger: function( type ) { var args, events, allEvents; - + if ( !this._events || !type ) { return this; } - + args = slice.call( arguments, 1 ); events = findHandlers( this._events, type ); allEvents = findHandlers( this._events, 'all' ); - + return triggerHanders( events, args ) && triggerHanders( allEvents, arguments ); } }; - + /** * 中介者，它本身是个单例，但可以通过[installTo](#WebUploader:Mediator:installTo)方法，使任何对象具备事件行为。 * 主要目的是负责模块与模块之间的合作，降低耦合度。 @@ -682,7 +682,7 @@ * @class Mediator */ return $.extend({ - + /** * 可以通过这个接口，使任何对象具备事件功能。 * @method installTo @@ -692,7 +692,7 @@ installTo: function( obj ) { return $.extend( obj, protos ); } - + }, protos ); }); /** @@ -702,9 +702,9 @@ 'base', 'mediator' ], function( Base, Mediator ) { - + var $ = Base.$; - + /** * 上传入口类。 * @class Uploader @@ -722,12 +722,12 @@ this.options = $.extend( true, {}, Uploader.options, opts ); this._init( this.options ); } - + // default Options // widgets中有相应扩展 Uploader.options = {}; Mediator.installTo( Uploader.prototype ); - + // 批量添加纯命令式方法。 $.each({ upload: 'start-upload', @@ -754,19 +754,19 @@ return this.request( command, arguments ); }; }); - + $.extend( Uploader.prototype, { state: 'pending', - + _init: function( opts ) { var me = this; - + me.request( 'init', opts, function() { me.state = 'ready'; me.trigger('ready'); }); }, - + /** * 获取或者设置Uploader配置项。 * @method option @@ -787,22 +787,22 @@ */ option: function( key, val ) { var opts = this.options; - + // setter if ( arguments.length > 1 ) { - + if ( $.isPlainObject( val ) && $.isPlainObject( opts[ key ] ) ) { $.extend( opts[ key ], val ); } else { opts[ key ] = val; } - + } else { // getter return key ? opts[ key ] : opts; } }, - + /** * 获取文件统计信息。返回一个包含一下信息的对象。 * * `successNum` 上传成功的文件数 @@ -816,10 +816,10 @@ getStats: function() { // return this._mgr.getStats.apply( this._mgr, arguments ); var stats = this.request('get-stats'); - + return { successNum: stats.numOfSuccess, - + // who care? // queueFailNum: 0, cancelNum: stats.numOfCancel, @@ -828,40 +828,40 @@ queueNum: stats.numOfQueue }; }, - + // 需要重写此方法来来支持opts.onEvent和instance.onEvent的处理器 trigger: function( type/*, args...*/ ) { var args = [].slice.call( arguments, 1 ), opts = this.options, name = 'on' + type.substring( 0, 1 ).toUpperCase() + type.substring( 1 ); - + if ( // 调用通过on方法注册的handler. Mediator.trigger.apply( this, arguments ) === false || - + // 调用opts.onEvent $.isFunction( opts[ name ] ) && opts[ name ].apply( this, args ) === false || - + // 调用this.onEvent $.isFunction( this[ name ] ) && this[ name ].apply( this, args ) === false || - + // 广播所有uploader的事件。 Mediator.trigger.apply( Mediator, [ this, type ].concat( args ) ) === false ) { - + return false; } - + return true; }, - + // widgets/widget.js将补充此方法的详细文档。 request: Base.noop }); - + /** * 创建Uploader实例，等同于new Uploader( opts ); * @method create @@ -872,10 +872,10 @@ Base.create = Uploader.create = function( opts ) { return new Uploader( opts ); }; - + // 暴露Uploader，可以通过它来扩展业务逻辑。 Base.Uploader = Uploader; - + return Uploader; }); /** @@ -885,10 +885,10 @@ 'base', 'mediator' ], function( Base, Mediator ) { - + var $ = Base.$, factories = {}, - + // 获取对象的第一个key getFirstKey = function( obj ) { for ( var key in obj ) { @@ -898,7 +898,7 @@ } return null; }; - + // 接口类。 function Runtime( options ) { this.options = $.extend({ @@ -906,20 +906,20 @@ }, options ); this.uid = Base.guid('rt_'); } - + $.extend( Runtime.prototype, { - + getContainer: function() { var opts = this.options, parent, container; - + if ( this._container ) { return this._container; } - + parent = $( opts.container || document.body ); container = $( document.createElement('div') ); - + container.attr( 'id', 'rt_' + this.uid ); container.css({ position: 'absolute', @@ -929,28 +929,28 @@ height: '1px', overflow: 'hidden' }); - + parent.append( container ); parent.addClass('webuploader-container'); this._container = container; return container; }, - + init: Base.noop, exec: Base.noop, - + destroy: function() { if ( this._container ) { this._container.parentNode.removeChild( this.__container ); } - + this.off(); } }); - + Runtime.orders = 'html5,flash'; - - + + /** * 添加Runtime实现。 * @param {String} type 类型 @@ -959,14 +959,14 @@ Runtime.addRuntime = function( type, factory ) { factories[ type ] = factory; }; - + Runtime.hasRuntime = function( type ) { return !!(type ? factories[ type ] : getFirstKey( factories )); }; - + Runtime.create = function( opts, orders ) { var type, runtime; - + orders = orders || Runtime.orders; $.each( orders.split( /\s*,\s*/g ), function() { if ( factories[ this ] ) { @@ -974,21 +974,21 @@ return false; } }); - + type = type || getFirstKey( factories ); - + if ( !type ) { throw new Error('Runtime Error'); } - + runtime = new factories[ type ]( opts ); return runtime; }; - + Mediator.installTo( Runtime.prototype ); return Runtime; }); - + /** * @fileOverview Runtime管理器，负责Runtime的选择, 连接 */ @@ -997,69 +997,69 @@ 'mediator', 'runtime/runtime' ], function( Base, Mediator, Runtime ) { - + var cache; - + cache = (function() { var obj = {}; - + return { add: function( runtime ) { obj[ runtime.uid ] = runtime; }, - + get: function( ruid, standalone ) { var i; - + if ( ruid ) { return obj[ ruid ]; } - + for ( i in obj ) { // 有些类型不能重用，比如filepicker. if ( standalone && obj[ i ].__standalone ) { continue; } - + return obj[ i ]; } - + return null; }, - + remove: function( runtime ) { delete obj[ runtime.uid ]; } }; })(); - + function RuntimeClient( component, standalone ) { var deferred = Base.Deferred(), runtime; - + this.uid = Base.guid('client_'); - + // 允许runtime没有初始化之前，注册一些方法在初始化后执行。 this.runtimeReady = function( cb ) { return deferred.done( cb ); }; - + this.connectRuntime = function( opts, cb ) { - + // already connected. if ( runtime ) { throw new Error('already connected!'); } - + deferred.done( cb ); - + if ( typeof opts === 'string' && cache.get( opts ) ) { runtime = cache.get( opts ); } - + // 像filePicker只能独立存在，不能公用。 runtime = runtime || cache.get( null, standalone ); - + // 需要创建 if ( !runtime ) { runtime = Runtime.create( opts, opts.runtimeOrder ); @@ -1074,46 +1074,46 @@ runtime.__promise.then( deferred.resolve ); runtime.__client++; } - + standalone && (runtime.__standalone = standalone); return runtime; }; - + this.getRuntime = function() { return runtime; }; - + this.disconnectRuntime = function() { if ( !runtime ) { return; } - + runtime.__client--; - + if ( runtime.__client <= 0 ) { cache.remove( runtime ); delete runtime.__promise; runtime.destroy(); } - + runtime = null; }; - + this.exec = function() { if ( !runtime ) { return; } - + var args = Base.slice( arguments ); component && args.unshift( component ); - + return runtime.exec.apply( this, args ); }; - + this.getRuid = function() { return runtime && runtime.uid; }; - + this.destroy = (function( destroy ) { return function() { destroy && destroy.apply( this, arguments ); @@ -1124,7 +1124,7 @@ }; })( this.destroy ); } - + Mediator.installTo( RuntimeClient.prototype ); return RuntimeClient; }); @@ -1136,45 +1136,45 @@ 'mediator', 'runtime/client' ], function( Base, Mediator, RuntimeClent ) { - + var $ = Base.$; - + function DragAndDrop( opts ) { opts = this.options = $.extend({}, DragAndDrop.options, opts ); - + opts.container = $( opts.container ); - + if ( !opts.container.length ) { return; } - + RuntimeClent.call( this, 'DragAndDrop' ); } - + DragAndDrop.options = { accept: null, disableGlobalDnd: false }; - + Base.inherits( RuntimeClent, { constructor: DragAndDrop, - + init: function() { var me = this; - + me.connectRuntime( me.options, function() { me.exec('init'); me.trigger('ready'); }); }, - + destroy: function() { this.disconnectRuntime(); } }); - + Mediator.installTo( DragAndDrop.prototype ); - + return DragAndDrop; }); /** @@ -1184,60 +1184,60 @@ 'base', 'uploader' ], function( Base, Uploader ) { - + var $ = Base.$, _init = Uploader.prototype._init, IGNORE = {}, widgetClass = []; - + function isArrayLike( obj ) { if ( !obj ) { return false; } - + var length = obj.length, type = $.type( obj ); - + if ( obj.nodeType === 1 && length ) { return true; } - + return type === 'array' || type !== 'function' && type !== 'string' && (length === 0 || typeof length === 'number' && length > 0 && (length - 1) in obj); } - + function Widget( uploader ) { this.owner = uploader; this.options = uploader.options; } - + $.extend( Widget.prototype, { - + init: Base.noop, - + // 类Backbone的事件监听声明，监听uploader实例上的事件 // widget直接无法监听事件，事件只能通过uploader来传递 invoke: function( apiName, args ) { - + /* { 'make-thumb': 'makeThumb' } */ var map = this.responseMap; - + // 如果无API响应声明则忽略 if ( !map || !(apiName in map) || !(map[ apiName ] in this) || !$.isFunction( this[ map[ apiName ] ] ) ) { - + return IGNORE; } - + return this[ map[ apiName ] ].apply( this, args ); - + }, - + /** * 发送命令。当传入`callback`或者`handler`中返回`promise`时。返回一个当所有`handler`中的promise都完成后完成的新`promise`。 * @method request @@ -1249,22 +1249,22 @@ return this.owner.request.apply( this.owner, arguments ); } }); - + // 扩展Uploader. $.extend( Uploader.prototype, { - + // 覆写_init用来初始化widgets _init: function() { var me = this, widgets = me._widgets = []; - + $.each( widgetClass, function( _, klass ) { widgets.push( new klass( me ) ); }); - + return _init.apply( me, arguments ); }, - + request: function( apiName, args, callback ) { var i = 0, widgets = this._widgets, @@ -1272,15 +1272,15 @@ rlts = [], dfds = [], widget, rlt, promise, key; - + args = isArrayLike( args ) ? args : [ args ]; - + for ( ; i < len; i++ ) { widget = widgets[ i ]; rlt = widget.invoke( apiName, args ); - + if ( rlt !== IGNORE ) { - + // Deferred对象 if ( Base.isPromise( rlt ) ) { dfds.push( rlt ); @@ -1289,22 +1289,22 @@ } } } - + // 如果有callback，则用异步方式。 if ( callback || dfds.length ) { promise = Base.when.apply( Base, dfds ); key = promise.pipe ? 'pipe' : 'then'; - + // 很重要不能删除。删除了会死循环。 // 保证执行顺序。让callback总是在下一个tick中执行。 return promise[ key ](function() { var deferred = Base.Deferred(), args = arguments; - + setTimeout(function() { deferred.resolve.apply( deferred, args ); }, 1 ); - + return deferred.promise(); })[ key ]( callback || Base.noop ); } else { @@ -1312,7 +1312,7 @@ } } }); - + /** * 添加组件 * @param {object} widgetProto 组件原型，构造函数通过constructor属性定义 @@ -1328,20 +1328,20 @@ Uploader.register = Widget.register = function( responseMap, widgetProto ) { var map = { init: 'init' }, klass; - + if ( arguments.length === 1 ) { widgetProto = responseMap; widgetProto.responseMap = map; } else { widgetProto.responseMap = $.extend( map, responseMap ); } - + klass = Base.inherits( Widget, widgetProto ); widgetClass.push( klass ); - + return klass; }; - + return Widget; }); /** @@ -1354,15 +1354,15 @@ 'widgets/widget' ], function( Base, Uploader, Dnd ) { var $ = Base.$; - + Uploader.options.dnd = ''; - + /** * @property {Selector} [dnd=undefined] 指定Drag And Drop拖拽的容器，如果不指定，则不启动。 * @namespace options * @for Uploader */ - + /** * @event dndAccept * @param {DataTransferItemList} items DataTransferItem @@ -1371,12 +1371,12 @@ */ return Uploader.register({ init: function( opts ) { - + if ( !opts.dnd || this.request('predict-runtime-type') !== 'html5' ) { return; } - + var me = this, deferred = Base.Deferred(), options = $.extend({}, { @@ -1385,26 +1385,26 @@ accept: opts.accept }), dnd; - + dnd = new Dnd( options ); - + dnd.once( 'ready', deferred.resolve ); dnd.on( 'drop', function( files ) { me.request( 'add-file', [ files ]); }); - + // 检测文件是否全部允许添加。 dnd.on( 'accept', function( items ) { return me.owner.trigger( 'dndAccept', items ); }); - + dnd.init(); - + return deferred.promise(); } }); }); - + /** * @fileOverview 错误信息 */ @@ -1413,36 +1413,36 @@ 'mediator', 'runtime/client' ], function( Base, Mediator, RuntimeClent ) { - + var $ = Base.$; - + function FilePaste( opts ) { opts = this.options = $.extend({}, opts ); opts.container = $( opts.container || document.body ); RuntimeClent.call( this, 'FilePaste' ); } - + Base.inherits( RuntimeClent, { constructor: FilePaste, - + init: function() { var me = this; - + me.connectRuntime( me.options, function() { me.exec('init'); me.trigger('ready'); }); }, - + destroy: function() { this.exec('destroy'); this.disconnectRuntime(); this.off(); } }); - + Mediator.installTo( FilePaste.prototype ); - + return FilePaste; }); /** @@ -1455,7 +1455,7 @@ 'widgets/widget' ], function( Base, Uploader, FilePaste ) { var $ = Base.$; - + /** * @property {Selector} [paste=undefined] 指定监听paste事件的容器，如果不指定，不启用此功能。此功能为通过粘贴来添加截屏的图片。建议设置为`document.body`. * @namespace options @@ -1463,12 +1463,12 @@ */ return Uploader.register({ init: function( opts ) { - + if ( !opts.paste || this.request('predict-runtime-type') !== 'html5' ) { return; } - + var me = this, deferred = Base.Deferred(), options = $.extend({}, { @@ -1476,15 +1476,15 @@ accept: opts.accept }), paste; - + paste = new FilePaste( options ); - + paste.once( 'ready', deferred.resolve ); paste.on( 'paste', function( files ) { me.owner.request( 'add-file', [ files ]); }); paste.init(); - + return deferred.promise(); } }); @@ -1496,36 +1496,36 @@ 'base', 'runtime/client' ], function( Base, RuntimeClient ) { - + function Blob( ruid, source ) { var me = this; - + me.source = source; me.ruid = ruid; - + RuntimeClient.call( me, 'Blob' ); - + this.uid = source.uid || this.uid; this.type = source.type || ''; this.size = source.size || 0; - + if ( ruid ) { me.connectRuntime( ruid ); } } - + Base.inherits( RuntimeClient, { constructor: Blob, - + slice: function( start, end ) { return this.exec( 'slice', start, end ); }, - + getSource: function() { return this.source; } }); - + return Blob; }); /** @@ -1537,39 +1537,39 @@ 'base', 'lib/blob' ], function( Base, Blob ) { - + var uid = 1, rExt = /\.([^.]+)$/; - + function File( ruid, file ) { var ext; - + Blob.apply( this, arguments ); this.name = file.name || ('untitled' + uid++); ext = rExt.exec( file.name ) ? RegExp.$1.toLowerCase() : ''; - + // todo 支持其他类型文件的转换。 - + // 如果有mimetype, 但是文件名里面没有找出后缀规律 if ( !ext && this.type ) { ext = /\/(jpg|jpeg|png|gif|bmp)$/i.exec( this.type ) ? RegExp.$1.toLowerCase() : ''; this.name += '.' + ext; } - + // 如果没有指定mimetype, 但是知道文件后缀。 if ( !this.type && ~'jpg,jpeg,png,gif,bmp'.indexOf( ext ) ) { this.type = 'image/' + (ext === 'jpg' ? 'jpeg' : ext); } - + this.ext = ext; this.lastModifiedDate = file.lastModifiedDate || (new Date()).toLocaleString(); } - + return Base.inherits( Blob, File ); }); - + /** * @fileOverview 错误信息 */ @@ -1578,28 +1578,28 @@ 'runtime/client', 'lib/file' ], function( Base, RuntimeClent, File ) { - + var $ = Base.$; - + function FilePicker( opts ) { opts = this.options = $.extend({}, FilePicker.options, opts ); - + opts.container = $( opts.id ); - + if ( !opts.container.length ) { throw new Error('按钮指定错误'); } - + opts.innerHTML = opts.innerHTML || opts.label || opts.container.html() || ''; - + opts.button = $( opts.button || document.createElement('div') ); opts.button.html( opts.innerHTML ); opts.container.html( opts.button ); - + RuntimeClent.call( this, 'FilePicker', true ); } - + FilePicker.options = { button: null, container: null, @@ -1609,34 +1609,34 @@ accept: null, name: 'file' }; - + Base.inherits( RuntimeClent, { constructor: FilePicker, - + init: function() { var me = this, opts = me.options, button = opts.button; - + button.addClass('webuploader-pick'); - + me.on( 'all', function( type ) { var files; - + switch ( type ) { case 'mouseenter': button.addClass('webuploader-pick-hover'); break; - + case 'mouseleave': button.removeClass('webuploader-pick-hover'); break; - + case 'change': files = me.exec('getFiles'); me.trigger( 'select', $.map( files, function( file ) { file = new File( me.getRuid(), file ); - + // 记录来源。 file._refer = opts.container; return file; @@ -1644,29 +1644,29 @@ break; } }); - + me.connectRuntime( opts, function() { me.refresh(); me.exec( 'init', opts ); me.trigger('ready'); }); - + $( window ).on( 'resize', function() { me.refresh(); }); }, - + refresh: function() { var shimContainer = this.getRuntime().getContainer(), button = this.options.button, width = button.outerWidth ? button.outerWidth() : button.width(), - + height = button.outerHeight ? button.outerHeight() : button.height(), - + pos = button.offset(); - + width && height && shimContainer.css({ bottom: 'auto', right: 'auto', @@ -1674,24 +1674,24 @@ height: height + 'px' }).offset( pos ); }, - + enable: function() { var btn = this.options.button; - + btn.removeClass('webuploader-pick-disable'); this.refresh(); }, - + disable: function() { var btn = this.options.button; - + this.getRuntime().getContainer().css({ top: '-99999px' }); - + btn.addClass('webuploader-pick-disable'); }, - + destroy: function() { if ( this.runtime ) { this.exec('destroy'); @@ -1699,10 +1699,10 @@ } } }); - + return FilePicker; }); - + /** * @fileOverview 文件选择相关 */ @@ -1713,9 +1713,9 @@ 'widgets/widget' ], function( Base, Uploader, FilePicker ) { var $ = Base.$; - + $.extend( Uploader.options, { - + /** * @property {Selector | Object} [pick=undefined] * @namespace options @@ -1728,7 +1728,7 @@ * * `multiple` {Boolean} 是否开起同时选择多个文件能力。 */ pick: null, - + /** * @property {Arroy} [accept=null] * @namespace options @@ -1755,25 +1755,25 @@ mimeTypes: 'image/*' }*/ }); - + return Uploader.register({ 'add-btn': 'addButton', refresh: 'refresh', disable: 'disable', enable: 'enable' }, { - + init: function( opts ) { this.pickers = []; return opts.pick && this.addButton( opts.pick ); }, - + refresh: function() { $.each( this.pickers, function() { this.refresh(); }); }, - + /** * @method addButton * @for Uploader @@ -1791,41 +1791,41 @@ opts = me.options, accept = opts.accept, options, picker, deferred; - + if ( !pick ) { return; } - + deferred = Base.Deferred(); $.isPlainObject( pick ) || (pick = { id: pick }); - + options = $.extend({}, pick, { accept: $.isPlainObject( accept ) ? [ accept ] : accept, swf: opts.swf, runtimeOrder: opts.runtimeOrder }); - + picker = new FilePicker( options ); - + picker.once( 'ready', deferred.resolve ); picker.on( 'select', function( files ) { me.owner.request( 'add-file', [ files ]); }); picker.init(); - + this.pickers.push( picker ); - + return deferred.promise(); }, - + disable: function() { $.each( this.pickers, function() { this.disable(); }); }, - + enable: function() { $.each( this.pickers, function() { this.enable(); @@ -1842,88 +1842,88 @@ 'lib/blob' ], function( Base, RuntimeClient, Blob ) { var $ = Base.$; - + // 构造器。 function Image( opts ) { this.options = $.extend({}, Image.options, opts ); RuntimeClient.call( this, 'Image' ); - + this.on( 'load', function() { this._info = this.exec('info'); this._meta = this.exec('meta'); }); } - + // 默认选项。 Image.options = { - + // 默认的图片处理质量 quality: 90, - + // 是否裁剪 crop: false, - + // 是否保留头部信息 preserveHeaders: true, - + // 是否允许放大。 allowMagnify: true }; - + // 继承RuntimeClient. Base.inherits( RuntimeClient, { constructor: Image, - + info: function( val ) { - + // setter if ( val ) { this._info = val; return this; } - + // getter return this._info; }, - + meta: function( val ) { - + // setter if ( val ) { this._meta = val; return this; } - + // getter return this._meta; }, - + loadFromBlob: function( blob ) { var me = this, ruid = blob.getRuid(); - + this.connectRuntime( ruid, function() { me.exec( 'init', me.options ); me.exec( 'loadFromBlob', blob ); }); }, - + resize: function() { var args = Base.slice( arguments ); return this.exec.apply( this, [ 'resize' ].concat( args ) ); }, - + getAsDataUrl: function( type ) { return this.exec( 'getAsDataUrl', type ); }, - + getAsBlob: function( type ) { var blob = this.exec( 'getAsBlob', type ); - + return new Blob( this.getRuid(), blob ); } }); - + return Image; }); /** @@ -1935,24 +1935,24 @@ 'lib/image', 'widgets/widget' ], function( Base, Uploader, Image ) { - + var $ = Base.$, throttle; - + // 根据要处理的文件大小来节流，一次不能处理太多，会卡。 throttle = (function( max ) { var occupied = 0, waiting = [], tick = function() { var item; - + while ( waiting.length && occupied < max ) { item = waiting.shift(); occupied += item[ 0 ]; item[ 1 ](); } }; - + return function( emiter, size, cb ) { waiting.push([ size, cb ]); emiter.once( 'destroy', function() { @@ -1962,9 +1962,9 @@ setTimeout( tick, 1 ); }; })( 5 * 1024 * 1024 ); - + $.extend( Uploader.options, { - + /** * @property {Object} [thumb] * @namespace options @@ -2003,14 +2003,14 @@ allowMagnify: true, crop: true, preserveHeaders: false, - + // 为空的话则保留原有图片格式。 // 否则强制转换成指定的类型。 // IE 8下面 base64 大小不能超过 32K 否则预览失败，而非 jpeg 编码的图片很可 // 能会超过 32k, 所以这里设置成预览的时候都是 image/jpeg type: 'image/jpeg' }, - + /** * @property {Object} [compress] * @namespace options @@ -2047,13 +2047,13 @@ preserveHeaders: true } }); - + return Uploader.register({ 'make-thumb': 'makeThumb', 'before-send-file': 'compressImage' }, { - - + + /** * 生成缩略图，此过程为异步，所以需要传入`callback`。 * 通常情况在图片加入队里后调用此方法来生成预览图以增强交互效果。 @@ -2087,70 +2087,70 @@ */ makeThumb: function( file, cb, width, height ) { var opts, image; - + file = this.request( 'get-file', file ); - + // 只预览图片格式。 if ( !file.type.match( /^image/ ) ) { cb( true ); return; } - + opts = $.extend({}, this.options.thumb ); - + // 如果传入的是object. if ( $.isPlainObject( width ) ) { opts = $.extend( opts, width ); width = null; } - + width = width || opts.width; height = height || opts.height; - + image = new Image( opts ); - + image.once( 'load', function() { file._info = file._info || image.info(); file._meta = file._meta || image.meta(); image.resize( width, height ); }); - + image.once( 'complete', function() { cb( false, image.getAsDataUrl( opts.type ) ); image.destroy(); }); - + image.once( 'error', function() { cb( true ); image.destroy(); }); - + throttle( image, file.source.size, function() { file._info && image.info( file._info ); file._meta && image.meta( file._meta ); image.loadFromBlob( file.source ); }); }, - + compressImage: function( file ) { var opts = this.options.compress || this.options.resize, compressSize = opts && opts.compressSize || 300 * 1024, image, deferred; - + file = this.request( 'get-file', file ); - + // 只预览图片格式。 if ( !opts || !~'image/jpeg,image/jpg'.indexOf( file.type ) || file.size < compressSize || file._compressed ) { return; } - + opts = $.extend({}, opts ); deferred = Base.Deferred(); - + image = new Image( opts ); - + deferred.always(function() { image.destroy(); image = null; @@ -2161,27 +2161,27 @@ file._meta = file._meta || image.meta(); image.resize( opts.width, opts.height ); }); - + image.once( 'complete', function() { var blob, size; - + // 移动端 UC / qq 浏览器的无图模式下 // ctx.getImageData 处理大图的时候会报 Exception // INDEX_SIZE_ERR: DOM Exception 1 try { blob = image.getAsBlob( opts.type ); - + size = file.size; - + // 如果压缩后，比原来还大则不用压缩后的。 if ( blob.size < size ) { // file.source.destroy && file.source.destroy(); file.source = blob; file.size = blob.size; - + file.trigger( 'resize', blob.size, size ); } - + // 标记，避免重复压缩。 file._compressed = true; deferred.resolve(); @@ -2190,10 +2190,10 @@ deferred.resolve(); } }); - + file._info && image.info( file._info ); file._meta && image.meta( file._meta ); - + image.loadFromBlob( file.source ); return deferred.promise(); } @@ -2206,17 +2206,17 @@ 'base', 'mediator' ], function( Base, Mediator ) { - + var $ = Base.$, idPrefix = 'WU_FILE_', idSuffix = 0, rExt = /\.([^.]+)$/, statusMap = {}; - + function gid() { return idPrefix + idSuffix++; } - + /** * 文件类 * @class File @@ -2225,14 +2225,14 @@ * @param {Lib.File} source [lib.File](#Lib.File)实例, 此source对象是带有Runtime信息的。 */ function WUFile( source ) { - + /** * 文件名，包括扩展名（后缀） * @property name * @type {string} */ this.name = source.name || 'Untitled'; - + /** * 文件体积（字节） * @property size @@ -2240,7 +2240,7 @@ * @default 0 */ this.size = source.size || 0; - + /** * 文件MIMETYPE类型，与文件类型的对应关系请参考[http://t.cn/z8ZnFny](http://t.cn/z8ZnFny) * @property type @@ -2248,7 +2248,7 @@ * @default 'application' */ this.type = source.type || 'application'; - + /** * 文件最后修改日期 * @property lastModifiedDate @@ -2256,42 +2256,42 @@ * @default 当前时间戳 */ this.lastModifiedDate = source.lastModifiedDate || (new Date() * 1); - + /** * 文件ID，每个对象具有唯一ID，与文件名无关 * @property id * @type {string} */ this.id = gid(); - + /** * 文件扩展名，通过文件名获取，例如test.png的扩展名为png * @property ext * @type {string} */ this.ext = rExt.exec( this.name ) ? RegExp.$1 : ''; - - + + /** * 状态文字说明。在不同的status语境下有不同的用途。 * @property statusText * @type {string} */ this.statusText = ''; - + // 存储文件状态，防止通过属性直接修改 statusMap[ this.id ] = WUFile.Status.INITED; - + this.source = source; this.loaded = 0; - + this.on( 'error', function( msg ) { this.setStatus( WUFile.Status.ERROR, msg ); }); } - + $.extend( WUFile.prototype, { - + /** * 设置状态，状态变化时会触发`change`事件。 * @method setStatus @@ -2300,11 +2300,11 @@ * @param {String} [statusText=''] 状态说明，常在error时使用，用http, abort,server等来标记是由于什么原因导致文件错误。 */ setStatus: function( status, text ) { - + var prevStatus = statusMap[ this.id ]; - + typeof text !== 'undefined' && (this.statusText = text); - + if ( status !== prevStatus ) { statusMap[ this.id ] = status; /** @@ -2313,9 +2313,9 @@ */ this.trigger( 'statuschange', status, prevStatus ); } - + }, - + /** * 获取文件状态 * @return {File.Status} @@ -2339,7 +2339,7 @@ getStatus: function() { return statusMap[ this.id ]; }, - + /** * 获取文件原始信息。 * @return {*} @@ -2347,14 +2347,14 @@ getSource: function() { return this.source; }, - + destory: function() { delete statusMap[ this.id ]; } }); - + Mediator.installTo( WUFile.prototype ); - + /** * 文件状态值，具体包括以下几种类型： * * `inited` 初始状态 @@ -2380,10 +2380,10 @@ INTERRUPT: 'interrupt', // 上传中断，可续传。 INVALID: 'invalid' // 文件不合格，不能重试上传。 }; - + return WUFile; }); - + /** * @fileOverview 文件队列 */ @@ -2392,17 +2392,17 @@ 'mediator', 'file' ], function( Base, Mediator, WUFile ) { - + var $ = Base.$, STATUS = WUFile.Status; - + /** * 文件队列, 用来存储各个状态中的文件。 * @class Queue * @extends Mediator */ function Queue() { - + /** * 统计文件数。 * * `numOfQueue` 队列中的文件数。 @@ -2421,16 +2421,16 @@ numOfUploadFailed: 0, numOfInvalid: 0 }; - + // 上传队列，仅包括等待上传的文件 this._queue = []; - + // 存储所有文件 this._map = {}; } - + $.extend( Queue.prototype, { - + /** * 将新文件加入对队列尾部 * @@ -2442,7 +2442,7 @@ this._fileAdded( file ); return this; }, - + /** * 将新文件加入对队列头部 * @@ -2454,7 +2454,7 @@ this._fileAdded( file ); return this; }, - + /** * 获取文件对象 * @@ -2468,7 +2468,7 @@ } return this._map[ fileId ]; }, - + /** * 从队列中取出一个指定状态的文件。 * @grammar fetch( status ) => File @@ -2479,20 +2479,20 @@ fetch: function( status ) { var len = this._queue.length, i, file; - + status = status || STATUS.QUEUED; - + for ( i = 0; i < len; i++ ) { file = this._queue[ i ]; - + if ( status === file.getStatus() ) { return file; } } - + return null; }, - + /** * 对队列进行排序，能够控制文件上传顺序。 * @grammar sort( fn ) => undefined @@ -2504,7 +2504,7 @@ this._queue.sort( fn ); } }, - + /** * 获取指定类型的文件列表, 列表中每一个成员为[File](#WebUploader:File)对象。 * @grammar getFiles( [status1[, status2 ...]] ) => Array @@ -2517,87 +2517,87 @@ i = 0, len = this._queue.length, file; - + for ( ; i < len; i++ ) { file = this._queue[ i ]; - + if ( sts.length && !~$.inArray( file.getStatus(), sts ) ) { continue; } - + ret.push( file ); } - + return ret; }, - + _fileAdded: function( file ) { var me = this, existing = this._map[ file.id ]; - + if ( !existing ) { this._map[ file.id ] = file; - + file.on( 'statuschange', function( cur, pre ) { me._onFileStatusChange( cur, pre ); }); } - + file.setStatus( STATUS.QUEUED ); }, - + _onFileStatusChange: function( curStatus, preStatus ) { var stats = this.stats; - + switch ( preStatus ) { case STATUS.PROGRESS: stats.numOfProgress--; break; - + case STATUS.QUEUED: stats.numOfQueue --; break; - + case STATUS.ERROR: stats.numOfUploadFailed--; break; - + case STATUS.INVALID: stats.numOfInvalid--; break; } - + switch ( curStatus ) { case STATUS.QUEUED: stats.numOfQueue++; break; - + case STATUS.PROGRESS: stats.numOfProgress++; break; - + case STATUS.ERROR: stats.numOfUploadFailed++; break; - + case STATUS.COMPLETE: stats.numOfSuccess++; break; - + case STATUS.CANCELLED: stats.numOfCancel++; break; - + case STATUS.INVALID: stats.numOfInvalid++; break; } } - + }); - + Mediator.installTo( Queue.prototype ); - + return Queue; }); /** @@ -2612,11 +2612,11 @@ 'runtime/client', 'widgets/widget' ], function( Base, Uploader, Queue, WUFile, File, RuntimeClient ) { - + var $ = Base.$, rExt = /\.\w+$/, Status = WUFile.Status; - + return Uploader.register({ 'sort-files': 'sortFiles', 'add-file': 'addFiles', @@ -2629,42 +2629,42 @@ 'reset': 'reset', 'accept-file': 'acceptFile' }, { - + init: function( opts ) { var me = this, deferred, len, i, item, arr, accept, runtime; - + if ( $.isPlainObject( opts.accept ) ) { opts.accept = [ opts.accept ]; } - + // accept中的中生成匹配正则。 if ( opts.accept ) { arr = []; - + for ( i = 0, len = opts.accept.length; i < len; i++ ) { item = opts.accept[ i ].extensions; item && arr.push( item ); } - + if ( arr.length ) { accept = '\\.' + arr.join(',') .replace( /,/g, '$|\\.' ) .replace( /\*/g, '.*' ) + '$'; } - + me.accept = new RegExp( accept, 'i' ); } - + me.queue = new Queue(); me.stats = me.queue.stats; - + // 如果当前不是html5运行时，那就算了。 // 不执行后续操作 if ( this.request('predict-runtime-type') !== 'html5' ) { return; } - + // 创建一个 html5 运行时的 placeholder // 以至于外部添加原生 File 对象的时候能正确包裹一下供 webuploader 使用。 deferred = Base.Deferred(); @@ -2677,82 +2677,82 @@ }); return deferred.promise(); }, - - + + // 为了支持外部直接添加一个原生File对象。 _wrapFile: function( file ) { if ( !(file instanceof WUFile) ) { - + if ( !(file instanceof File) ) { if ( !this._ruid ) { throw new Error('Can\'t add external files.'); } file = new File( this._ruid, file ); } - + file = new WUFile( file ); } - + return file; }, - + // 判断文件是否可以被加入队列 acceptFile: function( file ) { var invalid = !file || file.size < 6 || this.accept && - + // 如果名字中有后缀，才做后缀白名单处理。 rExt.exec( file.name ) && !this.accept.test( file.name ); - + return !invalid; }, - - + + /** * @event beforeFileQueued * @param {File} file File对象 * @description 当文件被加入队列之前触发，此事件的handler返回值为`false`，则此文件不会被添加进入队列。 * @for Uploader */ - + /** * @event fileQueued * @param {File} file File对象 * @description 当文件被加入队列以后触发。 * @for Uploader */ - + _addFile: function( file ) { var me = this; - + file = me._wrapFile( file ); - + // 不过类型判断允许不允许，先派送 `beforeFileQueued` if ( !me.owner.trigger( 'beforeFileQueued', file ) ) { return; } - + // 类型不匹配，则派送错误事件，并返回。 if ( !me.acceptFile( file ) ) { me.owner.trigger( 'error', 'Q_TYPE_DENIED', file ); return; } - + me.queue.append( file ); me.owner.trigger( 'fileQueued', file ); return file; }, - + getFile: function( fileId ) { return this.queue.getFile( fileId ); }, - + /** * @event filesQueued * @param {File} files 数组，内容为原始File(lib/File）对象。 * @description 当一批文件添加进队列以后触发。 * @for Uploader */ - + /** * @method addFiles * @grammar addFiles( file ) => undefined @@ -2763,33 +2763,33 @@ */ addFiles: function( files ) { var me = this; - + if ( !files.length ) { files = [ files ]; } - + files = $.map( files, function( file ) { return me._addFile( file ); }); - + me.owner.trigger( 'filesQueued', files ); - + if ( me.options.auto ) { me.request('start-upload'); } }, - + getStats: function() { return this.stats; }, - + /** * @event fileDequeued * @param {File} file File对象 * @description 当文件被移除队列后触发。 * @for Uploader */ - + /** * @method removeFile * @grammar removeFile( file ) => undefined @@ -2805,13 +2805,13 @@ */ removeFile: function( file ) { var me = this; - + file = file.id ? file : me.queue.getFile( file ); - + file.setStatus( Status.CANCELLED ); me.owner.trigger( 'fileDequeued', file ); }, - + /** * @method getFiles * @grammar getFiles() => Array @@ -2825,11 +2825,11 @@ getFiles: function() { return this.queue.getFiles.apply( this.queue, arguments ); }, - + fetchFile: function() { return this.queue.fetch.apply( this.queue, arguments ); }, - + /** * @method retry * @grammar retry() => undefined @@ -2844,26 +2844,26 @@ retry: function( file, noForceStart ) { var me = this, files, i, len; - + if ( file ) { file = file.id ? file : me.queue.getFile( file ); file.setStatus( Status.QUEUED ); noForceStart || me.request('start-upload'); return; } - + files = me.queue.getFiles( Status.ERROR ); i = 0; len = files.length; - + for ( ; i < len; i++ ) { file = files[ i ]; file.setStatus( Status.QUEUED ); } - + me.request('start-upload'); }, - + /** * @method sort * @grammar sort( fn ) => undefined @@ -2873,7 +2873,7 @@ sortFiles: function() { return this.queue.sort.apply( this.queue, arguments ); }, - + /** * @method reset * @grammar reset() => undefined @@ -2887,7 +2887,7 @@ this.stats = this.queue.stats; } }); - + }); /** * @fileOverview 添加获取Runtime相关信息的方法。 @@ -2897,21 +2897,21 @@ 'runtime/runtime', 'widgets/widget' ], function( Uploader, Runtime ) { - + Uploader.support = function() { return Runtime.hasRuntime.apply( Runtime, arguments ); }; - + return Uploader.register({ 'predict-runtime-type': 'predictRuntmeType' }, { - + init: function() { if ( !this.predictRuntmeType() ) { throw Error('Runtime Error'); } }, - + /** * 预测Uploader将采用哪个`Runtime` * @grammar predictRuntmeType() => String @@ -2922,10 +2922,10 @@ var orders = this.options.runtimeOrder || Runtime.orders, type = this.type, i, len; - + if ( !type ) { orders = orders.split( /\s*,\s*/g ); - + for ( i = 0, len = orders.length; i < len; i++ ) { if ( Runtime.hasRuntime( orders[ i ] ) ) { this.type = type = orders[ i ]; @@ -2933,7 +2933,7 @@ } } } - + return type; } }); @@ -2946,30 +2946,30 @@ 'runtime/client', 'mediator' ], function( Base, RuntimeClient, Mediator ) { - + var $ = Base.$; - + function Transport( opts ) { var me = this; - + opts = me.options = $.extend( true, {}, Transport.options, opts || {} ); RuntimeClient.call( this, 'Transport' ); - + this._blob = null; this._formData = opts.formData || {}; this._headers = opts.headers || {}; - + this.on( 'progress', this._timeout ); this.on( 'load error', function() { me.trigger( 'progress', 1 ); clearTimeout( me._timer ); }); } - + Transport.options = { server: '', method: 'POST', - + // 跨域时，是否允许携带cookie, 只有html5 runtime才有效 withCredentials: false, fileVal: 'file', @@ -2978,28 +2978,28 @@ headers: {}, sendAsBinary: false }; - + $.extend( Transport.prototype, { - + // 添加Blob, 只能添加一次，最后一次有效。 appendBlob: function( key, blob, filename ) { var me = this, opts = me.options; - + if ( me.getRuid() ) { me.disconnectRuntime(); } - + // 连接到blob归属的同一个runtime. me.connectRuntime( blob.ruid, function() { me.exec('init'); }); - + me._blob = blob; opts.fileVal = key || opts.fileVal; opts.filename = filename || opts.filename; }, - + // 添加其他字段 append: function( key, value ) { if ( typeof key === 'object' ) { @@ -3008,7 +3008,7 @@ this._formData[ key ] = value; } }, - + setRequestHeader: function( key, value ) { if ( typeof key === 'object' ) { $.extend( this._headers, key ); @@ -3016,56 +3016,56 @@ this._headers[ key ] = value; } }, - + send: function( method ) { this.exec( 'send', method ); this._timeout(); }, - + abort: function() { clearTimeout( this._timer ); return this.exec('abort'); }, - + destroy: function() { this.trigger('destroy'); this.off(); this.exec('destroy'); this.disconnectRuntime(); }, - + getResponse: function() { return this.exec('getResponse'); }, - + getResponseAsJson: function() { return this.exec('getResponseAsJson'); }, - + getStatus: function() { return this.exec('getStatus'); }, - + _timeout: function() { var me = this, duration = me.options.timeout; - + if ( !duration ) { return; } - + clearTimeout( me._timer ); me._timer = setTimeout(function() { me.abort(); me.trigger( 'error', 'timeout' ); }, duration ); } - + }); - + // 让Transport具备事件功能。 Mediator.installTo( Transport.prototype ); - + return Transport; }); /** @@ -3078,15 +3078,15 @@ 'lib/transport', 'widgets/widget' ], function( Base, Uploader, WUFile, Transport ) { - + var $ = Base.$, isPromise = Base.isPromise, Status = WUFile.Status; - + // 添加默认配置项 $.extend( Uploader.options, { - - + + /** * @property {Boolean} [prepareNextFile=false] * @namespace options @@ -3096,7 +3096,7 @@ * 如果能提前在当前文件传输期处理，可以节省总体耗时。 */ prepareNextFile: false, - + /** * @property {Boolean} [chunked=false] * @namespace options @@ -3104,7 +3104,7 @@ * @description 是否要分片处理大文件上传。 */ chunked: false, - + /** * @property {Boolean} [chunkSize=5242880] * @namespace options @@ -3112,7 +3112,7 @@ * @description 如果要分片，分多大一片？ 默认大小为5M. */ chunkSize: 5 * 1024 * 1024, - + /** * @property {Boolean} [chunkRetry=2] * @namespace options @@ -3120,7 +3120,7 @@ * @description 如果某个分片由于网络问题出错，允许自动重传多少次？ */ chunkRetry: 2, - + /** * @property {Boolean} [threads=3] * @namespace options @@ -3128,8 +3128,8 @@ * @description 上传并发数。允许同时最大上传进程数。 */ threads: 3, - - + + /** * @property {Object} [formData] * @namespace options @@ -3137,21 +3137,21 @@ * @description 文件上传请求的参数表，每次发送都会发送此对象中的参数。 */ formData: null - + /** * @property {Object} [fileVal='file'] * @namespace options * @for Uploader * @description 设置文件上传域的name。 */ - + /** * @property {Object} [method='POST'] * @namespace options * @for Uploader * @description 文件上传方式，`POST`或者`GET`。 */ - + /** * @property {Object} [sendAsBinary=false] * @namespace options @@ -3160,7 +3160,7 @@ * 其他参数在$_GET数组中。 */ }); - + // 负责将文件切片。 function CuteFile( file, chunkSize ) { var pending = [], @@ -3170,10 +3170,10 @@ start = 0, index = 0, len; - + while ( index < chunks ) { len = Math.min( chunkSize, total - start ); - + pending.push({ file: file, start: start, @@ -3184,63 +3184,63 @@ }); start += len; } - + file.blocks = pending.concat(); file.remaning = pending.length; - + return { file: file, - + has: function() { return !!pending.length; }, - + fetch: function() { return pending.shift(); } }; } - + Uploader.register({ 'start-upload': 'start', 'stop-upload': 'stop', 'skip-file': 'skipFile', 'is-in-progress': 'isInProgress' }, { - + init: function() { var owner = this.owner; - + this.runing = false; - + // 记录当前正在传的数据，跟threads相关 this.pool = []; - + // 缓存即将上传的文件。 this.pending = []; - + // 跟踪还有多少分片没有完成上传。 this.remaning = 0; this.__tick = Base.bindFn( this._tick, this ); - + owner.on( 'uploadComplete', function( file ) { // 把其他块取消了。 file.blocks && $.each( file.blocks, function( _, v ) { v.transport && (v.transport.abort(), v.transport.destroy()); delete v.transport; }); - + delete file.blocks; delete file.remaning; }); }, - + /** * @event startUpload * @description 当开始上传流程时触发。 * @for Uploader */ - + /** * 开始上传。此方法可以从初始状态调用开始上传流程，也可以从暂停状态调用，继续上传流程。 * @grammar upload() => undefined @@ -3249,40 +3249,40 @@ */ start: function() { var me = this; - + // 移出invalid的文件 $.each( me.request( 'get-files', Status.INVALID ), function() { me.request( 'remove-file', this ); }); - + if ( me.runing ) { return; } - + me.runing = true; - + // 如果有暂停的，则续传 $.each( me.pool, function( _, v ) { var file = v.file; - + if ( file.getStatus() === Status.INTERRUPT ) { file.setStatus( Status.PROGRESS ); me._trigged = false; v.transport && v.transport.send(); } }); - + me._trigged = false; me.owner.trigger('startUpload'); Base.nextTick( me.__tick ); }, - + /** * @event stopUpload * @description 当开始上传流程暂停时触发。 * @for Uploader */ - + /** * 暂停上传。第一个参数为是否中断上传当前正在上传的文件。 * @grammar stop() => undefined @@ -3292,21 +3292,21 @@ */ stop: function( interrupt ) { var me = this; - + if ( me.runing === false ) { return; } - + me.runing = false; - + interrupt && $.each( me.pool, function( _, v ) { v.transport && v.transport.abort(); v.file.setStatus( Status.INTERRUPT ); }); - + me.owner.trigger('stopUpload'); }, - + /** * 判断`Uplaode`r是否正在上传中。 * @grammar isInProgress() => Boolean @@ -3316,11 +3316,11 @@ isInProgress: function() { return !!this.runing; }, - + getStats: function() { return this.request('get-stats'); }, - + /** * 掉过一个文件上传，直接标记指定文件为已上传状态。 * @grammar skipFile( file ) => undefined @@ -3329,24 +3329,24 @@ */ skipFile: function( file, status ) { file = this.request( 'get-file', file ); - + file.setStatus( status || Status.COMPLETE ); file.skipped = true; - + // 如果正在上传。 file.blocks && $.each( file.blocks, function( _, v ) { var _tr = v.transport; - + if ( _tr ) { _tr.abort(); _tr.destroy(); delete v.transport; } }); - + this.owner.trigger( 'uploadSkip', file ); }, - + /** * @event uploadFinished * @description 当所有文件上传结束时触发。 @@ -3356,81 +3356,81 @@ var me = this, opts = me.options, fn, val; - + // 上一个promise还没有结束，则等待完成后再执行。 if ( me._promise ) { return me._promise.always( me.__tick ); } - + // 还有位置，且还有文件要处理的话。 if ( me.pool.length < opts.threads && (val = me._nextBlock()) ) { me._trigged = false; - + fn = function( val ) { me._promise = null; - + // 有可能是reject过来的，所以要检测val的类型。 val && val.file && me._startSend( val ); Base.nextTick( me.__tick ); }; - + me._promise = isPromise( val ) ? val.always( fn ) : fn( val ); - + // 没有要上传的了，且没有正在传输的了。 } else if ( !me.remaning && !me.getStats().numOfQueue ) { me.runing = false; - + me._trigged || Base.nextTick(function() { me.owner.trigger('uploadFinished'); }); me._trigged = true; } }, - + _nextBlock: function() { var me = this, act = me._act, opts = me.options, next, done; - + // 如果当前文件还有没有需要传输的，则直接返回剩下的。 if ( act && act.has() && act.file.getStatus() === Status.PROGRESS ) { - + // 是否提前准备下一个文件 if ( opts.prepareNextFile && !me.pending.length ) { me._prepareNextFile(); } - + return act.fetch(); - + // 否则，如果正在运行，则准备下一个文件，并等待完成后返回下个分片。 } else if ( me.runing ) { - + // 如果缓存中有，则直接在缓存中取，没有则去queue中取。 if ( !me.pending.length && me.getStats().numOfQueue ) { me._prepareNextFile(); } - + next = me.pending.shift(); done = function( file ) { if ( !file ) { return null; } - + act = CuteFile( file, opts.chunked ? opts.chunkSize : 0 ); me._act = act; return act.fetch(); }; - + // 文件可能还在prepare中，也有可能已经完全准备好了。 return isPromise( next ) ? next[ next.pipe ? 'pipe' : 'then']( done ) : done( next ); } }, - - + + /** * @event uploadStart * @param {File} file File对象 @@ -3442,64 +3442,64 @@ file = me.request('fetch-file'), pending = me.pending, promise; - + if ( file ) { promise = me.request( 'before-send-file', file, function() { - + // 有可能文件被skip掉了。文件被skip掉后，状态坑定不是Queued. if ( file.getStatus() === Status.QUEUED ) { me.owner.trigger( 'uploadStart', file ); file.setStatus( Status.PROGRESS ); return file; } - + return me._finishFile( file ); }); - + // 如果还在pending中，则替换成文件本身。 promise.done(function() { var idx = $.inArray( promise, pending ); - + ~idx && pending.splice( idx, 1, file ); }); - + // befeore-send-file的钩子就有错误发生。 promise.fail(function( reason ) { file.setStatus( Status.ERROR, reason ); me.owner.trigger( 'uploadError', file, reason ); me.owner.trigger( 'uploadComplete', file ); }); - + pending.push( promise ); } }, - + // 让出位置了，可以让其他分片开始上传 _popBlock: function( block ) { var idx = $.inArray( block, this.pool ); - + this.pool.splice( idx, 1 ); block.file.remaning--; this.remaning--; }, - + // 开始上传，可以被掉过。如果promise被reject了，则表示跳过此分片。 _startSend: function( block ) { var me = this, file = block.file, promise; - + me.pool.push( block ); me.remaning++; - + // 如果没有分片，则直接使用原始的。 // 不会丢失content-type信息。 block.blob = block.chunks === 1 ? file.source : file.source.slice( block.start, block.end ); - + // hook, 每个分片发送之前可能要做些异步的事情。 promise = me.request( 'before-send', block, function() { - + // 有可能文件已经上传出错了，所以不需要再传输了。 if ( file.getStatus() === Status.PROGRESS ) { me._doSend( block ); @@ -3508,7 +3508,7 @@ Base.nextTick( me.__tick ); } }); - + // 如果为fail了，则跳过此分片。 promise.fail(function() { if ( file.remaning === 1 ) { @@ -3525,8 +3525,8 @@ } }); }, - - + + /** * @event uploadBeforeSend * @param {Object} object @@ -3534,7 +3534,7 @@ * @description 当某个文件的分块在发送前触发，主要用来询问是否要添加附带参数，大文件在开起分片上传的前提下此事件可能会触发多次。 * @for Uploader */ - + /** * @event uploadAccept * @param {Object} object @@ -3542,7 +3542,7 @@ * @description 当某个文件上传到服务端响应后，会派送此事件来询问服务端响应是否有效。如果此事件handler返回值为`false`, 则此文件将派送`server`类型的`uploadError`事件。 * @for Uploader */ - + /** * @event uploadProgress * @param {File} file File对象 @@ -3550,8 +3550,8 @@ * @description 上传过程中触发，携带上传进度。 * @for Uploader */ - - + + /** * @event uploadError * @param {File} file File对象 @@ -3559,7 +3559,7 @@ * @description 当文件上传出错时触发。 * @for Uploader */ - + /** * @event uploadSuccess * @param {File} file File对象 @@ -3567,14 +3567,14 @@ * @description 当文件上传成功时触发。 * @for Uploader */ - + /** * @event uploadComplete * @param {File} [file] File对象 * @description 不管成功或者失败，文件上传完成时触发。 * @for Uploader */ - + // 做上传操作。 _doSend: function( block ) { var me = this, @@ -3585,90 +3585,90 @@ data = $.extend({}, opts.formData ), headers = $.extend({}, opts.headers ), requestAccept, ret; - + block.transport = tr; - + tr.on( 'destroy', function() { delete block.transport; me._popBlock( block ); Base.nextTick( me.__tick ); }); - + // 广播上传进度。以文件为单位。 tr.on( 'progress', function( percentage ) { var totalPercent = 0, uploaded = 0; - + // 可能没有abort掉，progress还是执行进来了。 // if ( !file.blocks ) { // return; // } - + totalPercent = block.percentage = percentage; - + if ( block.chunks > 1 ) { // 计算文件的整体速度。 $.each( file.blocks, function( _, v ) { uploaded += (v.percentage || 0) * (v.end - v.start); }); - + totalPercent = uploaded / file.size; } - + owner.trigger( 'uploadProgress', file, totalPercent || 0 ); }); - + // 用来询问，是否返回的结果是有错误的。 requestAccept = function( reject ) { var fn; - + ret = tr.getResponseAsJson() || {}; ret._raw = tr.getResponse(); fn = function( value ) { reject = value; }; - + // 服务端响应了，不代表成功了，询问是否响应正确。 if ( !owner.trigger( 'uploadAccept', block, ret, fn ) ) { reject = reject || 'server'; } - + return reject; }; - + // 尝试重试，然后广播文件上传出错。 tr.on( 'error', function( type, flag ) { block.retried = block.retried || 0; - + // 自动重试 if ( block.chunks > 1 && ~'http,abort'.indexOf( type ) && block.retried < opts.chunkRetry ) { - + block.retried++; tr.send(); - + } else { - + // http status 500 ~ 600 if ( !flag && type === 'server' ) { type = requestAccept( type ); } - + file.setStatus( Status.ERROR, type ); owner.trigger( 'uploadError', file, type ); owner.trigger( 'uploadComplete', file ); } }); - + // 上传成功 tr.on( 'load', function() { var reason; - + // 如果非预期，转向上传出错。 if ( (reason = requestAccept()) ) { tr.trigger( 'error', reason, true ); return; } - + // 全部上传完成。 if ( file.remaning === 1 ) { me._finishFile( file, ret ); @@ -3676,7 +3676,7 @@ tr.destroy(); } }); - + // 配置默认的上传字段。 data = $.extend( data, { id: file.id, @@ -3685,63 +3685,63 @@ lastModifiedDate: file.lastModifiedDate, size: file.size }); - + block.chunks > 1 && $.extend( data, { chunks: block.chunks, chunk: block.chunk }); - + // 在发送之间可以添加字段什么的。。。 // 如果默认的字段不够使用，可以通过监听此事件来扩展 owner.trigger( 'uploadBeforeSend', block, data, headers ); - + // 开始发送。 tr.appendBlob( opts.fileVal, block.blob, file.name ); tr.append( data ); tr.setRequestHeader( headers ); tr.send(); }, - + // 完成上传。 _finishFile: function( file, ret, hds ) { var owner = this.owner; - + return owner .request( 'after-send-file', arguments, function() { file.setStatus( Status.COMPLETE ); owner.trigger( 'uploadSuccess', file, ret, hds ); }) .fail(function( reason ) { - + // 如果外部已经标记为invalid什么的，不再改状态。 if ( file.getStatus() === Status.PROGRESS ) { file.setStatus( Status.ERROR, reason ); } - + owner.trigger( 'uploadError', file, reason ); }) .always(function() { owner.trigger( 'uploadComplete', file ); }); } - + }); }); /** * @fileOverview 各种验证，包括文件总大小是否超出、单文件是否超出和文件是否重复。 */ - + define('widgets/validator',[ 'base', 'uploader', 'file', 'widgets/widget' ], function( Base, Uploader, WUFile ) { - + var $ = Base.$, validators = {}, api; - + /** * @event error * @param {String} type 错误类型。 @@ -3751,21 +3751,21 @@ * * `Q_EXCEED_SIZE_LIMIT` 在设置了`Q_EXCEED_SIZE_LIMIT`且尝试给`uploader`添加的文件总大小超出这个值时派送。 * @for Uploader */ - + // 暴露给外面的api api = { - + // 添加验证器 addValidator: function( type, cb ) { validators[ type ] = cb; }, - + // 移除验证器 removeValidator: function( type ) { delete validators[ type ]; } }; - + // 在Uploader初始化的时候启动Validators的初始化 Uploader.register({ init: function() { @@ -3775,7 +3775,7 @@ }); } }); - + /** * @property {int} [fileNumLimit=undefined] * @namespace options @@ -3788,13 +3788,13 @@ count = 0, max = opts.fileNumLimit >> 0, flag = true; - + if ( !max ) { return; } - + uploader.on( 'beforeFileQueued', function( file ) { - + if ( count >= max && flag ) { flag = false; this.trigger( 'error', 'Q_EXCEED_NUM_LIMIT', max, file ); @@ -3802,24 +3802,24 @@ flag = true; }, 1 ); } - + return count >= max ? false : true; }); - + uploader.on( 'fileQueued', function() { count++; }); - + uploader.on( 'fileDequeued', function() { count--; }); - + uploader.on( 'uploadFinished', function() { count = 0; }); }); - - + + /** * @property {int} [fileSizeLimit=undefined] * @namespace options @@ -3832,14 +3832,14 @@ count = 0, max = opts.fileSizeLimit >> 0, flag = true; - + if ( !max ) { return; } - + uploader.on( 'beforeFileQueued', function( file ) { var invalid = count + file.size > max; - + if ( invalid && flag ) { flag = false; this.trigger( 'error', 'Q_EXCEED_SIZE_LIMIT', max, file ); @@ -3847,23 +3847,23 @@ flag = true; }, 1 ); } - + return invalid ? false : true; }); - + uploader.on( 'fileQueued', function( file ) { count += file.size; }); - + uploader.on( 'fileDequeued', function( file ) { count -= file.size; }); - + uploader.on( 'uploadFinished', function() { count = 0; }); }); - + /** * @property {int} [fileSingleSizeLimit=undefined] * @namespace options @@ -3874,23 +3874,23 @@ var uploader = this, opts = uploader.options, max = opts.fileSingleSizeLimit; - + if ( !max ) { return; } - + uploader.on( 'beforeFileQueued', function( file ) { - + if ( file.size > max ) { file.setStatus( WUFile.Status.INVALID, 'exceed_size' ); this.trigger( 'error', 'F_EXCEED_SIZE', file ); return false; } - + }); - + }); - + /** * @property {int} [duplicate=undefined] * @namespace options @@ -3901,75 +3901,75 @@ var uploader = this, opts = uploader.options, mapping = {}; - + if ( opts.duplicate ) { return; } - + function hashString( str ) { var hash = 0, i = 0, len = str.length, _char; - + for ( ; i < len; i++ ) { _char = str.charCodeAt( i ); hash = _char + (hash << 6) + (hash << 16) - hash; } - + return hash; } - + uploader.on( 'beforeFileQueued', function( file ) { var hash = file.__hash || (file.__hash = hashString( file.name + file.size + file.lastModifiedDate )); - + // 已经重复了 if ( mapping[ hash ] ) { this.trigger( 'error', 'F_DUPLICATE', file ); return false; } }); - + uploader.on( 'fileQueued', function( file ) { var hash = file.__hash; - + hash && (mapping[ hash ] = true); }); - + uploader.on( 'fileDequeued', function( file ) { var hash = file.__hash; - + hash && (delete mapping[ hash ]); }); }); - + return api; }); - + /** * @fileOverview Runtime管理器，负责Runtime的选择, 连接 */ define('runtime/compbase',[],function() { - + function CompBase( owner, runtime ) { - + this.owner = owner; this.options = owner.options; - + this.getRuntime = function() { return runtime; }; - + this.getRuid = function() { return runtime.uid; }; - + this.trigger = function() { return owner.trigger.apply( owner, arguments ); }; } - + return CompBase; }); /** @@ -3980,45 +3980,45 @@ 'runtime/runtime', 'runtime/compbase' ], function( Base, Runtime, CompBase ) { - + var type = 'html5', components = {}; - + function Html5Runtime() { var pool = {}, me = this, destory = this.destory; - + Runtime.apply( me, arguments ); me.type = type; - - + + // 这个方法的调用者，实际上是RuntimeClient me.exec = function( comp, fn/*, args...*/) { var client = this, uid = client.uid, args = Base.slice( arguments, 2 ), instance; - + if ( components[ comp ] ) { instance = pool[ uid ] = pool[ uid ] || new components[ comp ]( client, me ); - + if ( instance[ fn ] ) { return instance[ fn ].apply( instance, args ); } } }; - + me.destory = function() { // @todo 删除池子中的所有实例 return destory && destory.apply( this, arguments ); }; } - + Base.inherits( Runtime, { constructor: Html5Runtime, - + // 不需要连接其他程序，直接执行callback init: function() { var me = this; @@ -4026,21 +4026,21 @@ me.trigger('ready'); }, 1 ); } - + }); - + // 注册Components Html5Runtime.register = function( name, component ) { var klass = components[ name ] = Base.inherits( CompBase, component ); return klass; }; - + // 注册html5运行时。 // 只有在支持的前提下注册。 if ( window.Blob && window.FileReader && window.DataView ) { Runtime.addRuntime( type, Html5Runtime ); } - + return Html5Runtime; }); /** @@ -4050,14 +4050,14 @@ 'runtime/html5/runtime', 'lib/blob' ], function( Html5Runtime, Blob ) { - + return Html5Runtime.register( 'Blob', { slice: function( start, end ) { var blob = this.owner.source, slice = blob.slice || blob.webkitSlice || blob.mozSlice; - + blob = slice.call( blob, start, end ); - + return new Blob( this.getRuid(), blob ); } }); @@ -4070,148 +4070,148 @@ 'runtime/html5/runtime', 'lib/file' ], function( Base, Html5Runtime, File ) { - + var $ = Base.$, prefix = 'webuploader-dnd-'; - + return Html5Runtime.register( 'DragAndDrop', { init: function() { var elem = this.elem = this.options.container; - + this.dragEnterHandler = Base.bindFn( this._dragEnterHandler, this ); this.dragOverHandler = Base.bindFn( this._dragOverHandler, this ); this.dragLeaveHandler = Base.bindFn( this._dragLeaveHandler, this ); this.dropHandler = Base.bindFn( this._dropHandler, this ); this.dndOver = false; - + elem.on( 'dragenter', this.dragEnterHandler ); elem.on( 'dragover', this.dragOverHandler ); elem.on( 'dragleave', this.dragLeaveHandler ); elem.on( 'drop', this.dropHandler ); - + if ( this.options.disableGlobalDnd ) { $( document ).on( 'dragover', this.dragOverHandler ); $( document ).on( 'drop', this.dropHandler ); } }, - + _dragEnterHandler: function( e ) { var me = this, denied = me._denied || false, items; - + e = e.originalEvent || e; - + if ( !me.dndOver ) { me.dndOver = true; - + // 注意只有 chrome 支持。 items = e.dataTransfer.items; - + if ( items && items.length ) { me._denied = denied = !me.trigger( 'accept', items ); } - + me.elem.addClass( prefix + 'over' ); me.elem[ denied ? 'addClass' : 'removeClass' ]( prefix + 'denied' ); } - - + + e.dataTransfer.dropEffect = denied ? 'none' : 'copy'; - + return false; }, - + _dragOverHandler: function( e ) { // 只处理框内的。 var parentElem = this.elem.parent().get( 0 ); if ( parentElem && !$.contains( parentElem, e.currentTarget ) ) { return false; } - + clearTimeout( this._leaveTimer ); this._dragEnterHandler.call( this, e ); - + return false; }, - + _dragLeaveHandler: function() { var me = this, handler; - + handler = function() { me.dndOver = false; me.elem.removeClass( prefix + 'over ' + prefix + 'denied' ); }; - + clearTimeout( me._leaveTimer ); me._leaveTimer = setTimeout( handler, 100 ); return false; }, - + _dropHandler: function( e ) { var me = this, ruid = me.getRuid(), parentElem = me.elem.parent().get( 0 ); - + // 只处理框内的。 if ( parentElem && !$.contains( parentElem, e.currentTarget ) ) { return false; } - + me._getTansferFiles( e, function( results ) { me.trigger( 'drop', $.map( results, function( file ) { return new File( ruid, file ); }) ); }); - + me.dndOver = false; me.elem.removeClass( prefix + 'over' ); return false; }, - + // 如果传入 callback 则去查看文件夹，否则只管当前文件夹。 _getTansferFiles: function( e, callback ) { var results = [], promises = [], items, files, dataTransfer, file, item, i, len, canAccessFolder; - + e = e.originalEvent || e; - + dataTransfer = e.dataTransfer; items = dataTransfer.items; files = dataTransfer.files; - + canAccessFolder = !!(items && items[ 0 ].webkitGetAsEntry); - + for ( i = 0, len = files.length; i < len; i++ ) { file = files[ i ]; item = items && items[ i ]; - + if ( canAccessFolder && item.webkitGetAsEntry().isDirectory ) { - + promises.push( this._traverseDirectoryTree( item.webkitGetAsEntry(), results ) ); } else { results.push( file ); } } - + Base.when.apply( Base, promises ).done(function() { - + if ( !results.length ) { return; } - + callback( results ); }); }, - + _traverseDirectoryTree: function( entry, results ) { var deferred = Base.Deferred(), me = this; - + if ( entry.isFile ) { entry.file(function( file ) { results.push( file ); @@ -4223,30 +4223,30 @@ promises = [], arr = [], // 为了保证顺序。 i; - + for ( i = 0; i < len; i++ ) { promises.push( me._traverseDirectoryTree( entries[ i ], arr ) ); } - + Base.when.apply( Base, promises ).then(function() { results.push.apply( results, arr ); deferred.resolve(); }, deferred.reject ); }); } - + return deferred.promise(); }, - + destroy: function() { var elem = this.elem; - + elem.off( 'dragenter', this.dragEnterHandler ); elem.off( 'dragover', this.dragEnterHandler ); elem.off( 'dragleave', this.dragLeaveHandler ); elem.off( 'drop', this.dropHandler ); - + if ( this.options.disableGlobalDnd ) { $( document ).off( 'dragover', this.dragOverHandler ); $( document ).off( 'drop', this.dropHandler ); @@ -4254,7 +4254,7 @@ } }); }); - + /** * @fileOverview FilePaste */ @@ -4263,23 +4263,23 @@ 'runtime/html5/runtime', 'lib/file' ], function( Base, Html5Runtime, File ) { - + return Html5Runtime.register( 'FilePaste', { init: function() { var opts = this.options, elem = this.elem = opts.container, accept = '.*', arr, i, len, item; - + // accetp的mimeTypes中生成匹配正则。 if ( opts.accept ) { arr = []; - + for ( i = 0, len = opts.accept.length; i < len; i++ ) { item = opts.accept[ i ].mimeTypes; item && arr.push( item ); } - + if ( arr.length ) { accept = arr.join(','); accept = accept.replace( /,/g, '|' ).replace( /\*/g, '.*' ); @@ -4289,25 +4289,25 @@ this.hander = Base.bindFn( this._pasteHander, this ); elem.on( 'paste', this.hander ); }, - + _pasteHander: function( e ) { var allowed = [], ruid = this.getRuid(), items, item, blob, i, len; - + e = e.originalEvent || e; items = e.clipboardData.items; - + for ( i = 0, len = items.length; i < len; i++ ) { item = items[ i ]; - + if ( item.kind !== 'file' || !(blob = item.getAsFile()) ) { continue; } - + allowed.push( new File( ruid, blob ) ); } - + if ( allowed.length ) { // 不阻止非文件粘贴（文字粘贴）的事件冒泡 e.preventDefault(); @@ -4315,13 +4315,13 @@ this.trigger( 'paste', allowed ); } }, - + destroy: function() { this.elem.off( 'paste', this.hander ); } }); }); - + /** * @fileOverview FilePicker */ @@ -4329,9 +4329,9 @@ 'base', 'runtime/html5/runtime' ], function( Base, Html5Runtime ) { - + var $ = Base.$; - + return Html5Runtime.register( 'FilePicker', { init: function() { var container = this.getRuntime().getContainer(), @@ -4341,15 +4341,15 @@ lable = $( document.createElement('label') ), input = $( document.createElement('input') ), arr, i, len, mouseHandler; - + input.attr( 'type', 'file' ); input.attr( 'name', opts.name ); input.addClass('webuploader-element-invisible'); - + lable.on( 'click', function() { input.trigger('click'); }); - + lable.css({ opacity: 0, width: '100%', @@ -4358,55 +4358,55 @@ cursor: 'pointer', background: '#ffffff' }); - + if ( opts.multiple ) { input.attr( 'multiple', 'multiple' ); } - + // @todo Firefox不支持单独指定后缀 if ( opts.accept && opts.accept.length > 0 ) { arr = []; - + for ( i = 0, len = opts.accept.length; i < len; i++ ) { arr.push( opts.accept[ i ].mimeTypes ); } - + input.attr( 'accept', arr.join(',') ); } - + container.append( input ); container.append( lable ); - + mouseHandler = function( e ) { owner.trigger( e.type ); }; - + input.on( 'change', function( e ) { var fn = arguments.callee, clone; - + me.files = e.target.files; - + // reset input clone = this.cloneNode( true ); this.parentNode.replaceChild( clone, this ); - + input.off(); input = $( clone ).on( 'change', fn ) .on( 'mouseenter mouseleave', mouseHandler ); - + owner.trigger('change'); }); - + lable.on( 'mouseenter mouseleave', mouseHandler ); - + }, - - + + getFiles: function() { return this.files; }, - + destroy: function() { // todo } @@ -4421,97 +4421,97 @@ define('runtime/html5/util',[ 'base' ], function( Base ) { - + var urlAPI = window.createObjectURL && window || window.URL && URL.revokeObjectURL && URL || window.webkitURL, createObjectURL = Base.noop, revokeObjectURL = createObjectURL; - + if ( urlAPI ) { - + // 更安全的方式调用，比如android里面就能把context改成其他的对象。 createObjectURL = function() { return urlAPI.createObjectURL.apply( urlAPI, arguments ); }; - + revokeObjectURL = function() { return urlAPI.revokeObjectURL.apply( urlAPI, arguments ); }; } - + return { createObjectURL: createObjectURL, revokeObjectURL: revokeObjectURL, - + dataURL2Blob: function( dataURI ) { var byteStr, intArray, ab, i, mimetype, parts; - + parts = dataURI.split(','); - + if ( ~parts[ 0 ].indexOf('base64') ) { byteStr = atob( parts[ 1 ] ); } else { byteStr = decodeURIComponent( parts[ 1 ] ); } - + ab = new ArrayBuffer( byteStr.length ); intArray = new Uint8Array( ab ); - + for ( i = 0; i < byteStr.length; i++ ) { intArray[ i ] = byteStr.charCodeAt( i ); } - + mimetype = parts[ 0 ].split(':')[ 1 ].split(';')[ 0 ]; - + return this.arrayBufferToBlob( ab, mimetype ); }, - + dataURL2ArrayBuffer: function( dataURI ) { var byteStr, intArray, i, parts; - + parts = dataURI.split(','); - + if ( ~parts[ 0 ].indexOf('base64') ) { byteStr = atob( parts[ 1 ] ); } else { byteStr = decodeURIComponent( parts[ 1 ] ); } - + intArray = new Uint8Array( byteStr.length ); - + for ( i = 0; i < byteStr.length; i++ ) { intArray[ i ] = byteStr.charCodeAt( i ); } - + return intArray.buffer; }, - + arrayBufferToBlob: function( buffer, type ) { var builder = window.BlobBuilder || window.WebKitBlobBuilder, bb; - + // android不支持直接new Blob, 只能借助blobbuilder. if ( builder ) { bb = new builder(); bb.append( buffer ); return bb.getBlob( type ); } - + return new Blob([ buffer ], type ? { type: type } : {} ); }, - + // 抽出来主要是为了解决android下面canvas.toDataUrl不支持jpeg. // 你得到的结果是png. canvasToDataUrl: function( canvas, type, quality ) { return canvas.toDataURL( type, quality / 100 ); }, - + // imagemeat会复写这个方法，如果用户选择加载那个文件了的话。 parseMeta: function( blob, callback ) { callback( false, {}); }, - + // imagemeat会复写这个方法，如果用户选择加载那个文件了的话。 updateImageHead: function( data ) { return data; @@ -4527,76 +4527,76 @@ define('runtime/html5/imagemeta',[ 'runtime/html5/util' ], function( Util ) { - + var api; - + api = { parsers: { 0xffe1: [] }, - + maxMetaDataSize: 262144, - + parse: function( blob, cb ) { var me = this, fr = new FileReader(); - + fr.onload = function() { cb( false, me._parse( this.result ) ); fr = fr.onload = fr.onerror = null; }; - + fr.onerror = function( e ) { cb( e.message ); fr = fr.onload = fr.onerror = null; }; - + blob = blob.slice( 0, me.maxMetaDataSize ); fr.readAsArrayBuffer( blob.getSource() ); }, - + _parse: function( buffer, noParse ) { if ( buffer.byteLength < 6 ) { return; } - + var dataview = new DataView( buffer ), offset = 2, maxOffset = dataview.byteLength - 4, headLength = offset, ret = {}, markerBytes, markerLength, parsers, i; - + if ( dataview.getUint16( 0 ) === 0xffd8 ) { - + while ( offset < maxOffset ) { markerBytes = dataview.getUint16( offset ); - + if ( markerBytes >= 0xffe0 && markerBytes <= 0xffef || markerBytes === 0xfffe ) { - + markerLength = dataview.getUint16( offset + 2 ) + 2; - + if ( offset + markerLength > dataview.byteLength ) { break; } - + parsers = api.parsers[ markerBytes ]; - + if ( !noParse && parsers ) { for ( i = 0; i < parsers.length; i += 1 ) { parsers[ i ].call( api, dataview, offset, markerLength, ret ); } } - + offset += markerLength; headLength = offset; } else { break; } } - + if ( headLength > 6 ) { if ( buffer.slice ) { ret.imageHead = buffer.slice( 2, headLength ); @@ -4608,45 +4608,45 @@ } } } - + return ret; }, - + updateImageHead: function( buffer, head ) { var data = this._parse( buffer, true ), buf1, buf2, bodyoffset; - - + + bodyoffset = 2; if ( data.imageHead ) { bodyoffset = 2 + data.imageHead.byteLength; } - + if ( buffer.slice ) { buf2 = buffer.slice( bodyoffset ); } else { buf2 = new Uint8Array( buffer ).subarray( bodyoffset ); } - + buf1 = new Uint8Array( head.byteLength + 2 + buf2.byteLength ); - + buf1[ 0 ] = 0xFF; buf1[ 1 ] = 0xD8; buf1.set( new Uint8Array( head ), 2 ); buf1.set( new Uint8Array( buf2 ), head.byteLength + 2 ); - + return buf1.buffer; } }; - + Util.parseMeta = function() { return api.parse.apply( api, arguments ); }; - + Util.updateImageHead = function() { return api.updateImageHead.apply( api, arguments ); }; - + return api; }); /** @@ -4656,7 +4656,7 @@ * 去除了 Exif Sub IFD Pointer, GPS Info IFD Pointer, Exif Thumbnail. * @fileOverview EXIF解析 */ - + // Sample // ==================================== // Make : Apple @@ -4696,21 +4696,21 @@ 'base', 'runtime/html5/imagemeta' ], function( Base, ImageMeta ) { - + var EXIF = {}; - + EXIF.ExifMap = function() { return this; }; - + EXIF.ExifMap.prototype.map = { 'Orientation': 0x0112 }; - + EXIF.ExifMap.prototype.get = function( id ) { return this[ id ] || this[ this.map[ id ] ]; }; - + EXIF.exifTagTypes = { // byte, 8-bit unsigned int: 1: { @@ -4719,7 +4719,7 @@ }, size: 1 }, - + // ascii, 8-bit byte: 2: { getValue: function( dataView, dataOffset ) { @@ -4728,7 +4728,7 @@ size: 1, ascii: true }, - + // short, 16 bit int: 3: { getValue: function( dataView, dataOffset, littleEndian ) { @@ -4736,7 +4736,7 @@ }, size: 2 }, - + // long, 32 bit int: 4: { getValue: function( dataView, dataOffset, littleEndian ) { @@ -4744,7 +4744,7 @@ }, size: 4 }, - + // rational = two long values, // first is numerator, second is denominator: 5: { @@ -4754,7 +4754,7 @@ }, size: 8 }, - + // slong, 32 bit signed int: 9: { getValue: function( dataView, dataOffset, littleEndian ) { @@ -4762,7 +4762,7 @@ }, size: 4 }, - + // srational, two slongs, first is numerator, second is denominator: 10: { getValue: function( dataView, dataOffset, littleEndian ) { @@ -4772,101 +4772,101 @@ size: 8 } }; - + // undefined, 8-bit byte, value depending on field: EXIF.exifTagTypes[ 7 ] = EXIF.exifTagTypes[ 1 ]; - + EXIF.getExifValue = function( dataView, tiffOffset, offset, type, length, littleEndian ) { - + var tagType = EXIF.exifTagTypes[ type ], tagSize, dataOffset, values, i, str, c; - + if ( !tagType ) { Base.log('Invalid Exif data: Invalid tag type.'); return; } - + tagSize = tagType.size * length; - + // Determine if the value is contained in the dataOffset bytes, // or if the value at the dataOffset is a pointer to the actual data: dataOffset = tagSize > 4 ? tiffOffset + dataView.getUint32( offset + 8, littleEndian ) : (offset + 8); - + if ( dataOffset + tagSize > dataView.byteLength ) { Base.log('Invalid Exif data: Invalid data offset.'); return; } - + if ( length === 1 ) { return tagType.getValue( dataView, dataOffset, littleEndian ); } - + values = []; - + for ( i = 0; i < length; i += 1 ) { values[ i ] = tagType.getValue( dataView, dataOffset + i * tagType.size, littleEndian ); } - + if ( tagType.ascii ) { str = ''; - + // Concatenate the chars: for ( i = 0; i < values.length; i += 1 ) { c = values[ i ]; - + // Ignore the terminating NULL byte(s): if ( c === '\u0000' ) { break; } str += c; } - + return str; } return values; }; - + EXIF.parseExifTag = function( dataView, tiffOffset, offset, littleEndian, data ) { - + var tag = dataView.getUint16( offset, littleEndian ); data.exif[ tag ] = EXIF.getExifValue( dataView, tiffOffset, offset, dataView.getUint16( offset + 2, littleEndian ), // tag type dataView.getUint32( offset + 4, littleEndian ), // tag length littleEndian ); }; - + EXIF.parseExifTags = function( dataView, tiffOffset, dirOffset, littleEndian, data ) { - + var tagsNumber, dirEndOffset, i; - + if ( dirOffset + 6 > dataView.byteLength ) { Base.log('Invalid Exif data: Invalid directory offset.'); return; } - + tagsNumber = dataView.getUint16( dirOffset, littleEndian ); dirEndOffset = dirOffset + 2 + 12 * tagsNumber; - + if ( dirEndOffset + 4 > dataView.byteLength ) { Base.log('Invalid Exif data: Invalid directory size.'); return; } - + for ( i = 0; i < tagsNumber; i += 1 ) { this.parseExifTag( dataView, tiffOffset, dirOffset + 2 + 12 * i, // tag offset littleEndian, data ); } - + // Return the offset to the next directory: return dataView.getUint32( dirEndOffset, littleEndian ); }; - + // EXIF.getExifThumbnail = function(dataView, offset, length) { // var hexData, // i, @@ -4882,12 +4882,12 @@ // } // return 'data:image/jpeg,%' + hexData.join('%'); // }; - + EXIF.parseExifData = function( dataView, offset, length, data ) { - + var tiffOffset = offset + 10, littleEndian, dirOffset; - + // Check for the ASCII code for "Exif" (0x45786966): if ( dataView.getUint32( offset + 4 ) !== 0x45786966 ) { // No Exif data, might be XMP data instead @@ -4897,34 +4897,34 @@ Base.log('Invalid Exif data: Invalid segment size.'); return; } - + // Check for the two null bytes: if ( dataView.getUint16( offset + 8 ) !== 0x0000 ) { Base.log('Invalid Exif data: Missing byte alignment offset.'); return; } - + // Check the byte alignment: switch ( dataView.getUint16( tiffOffset ) ) { case 0x4949: littleEndian = true; break; - + case 0x4D4D: littleEndian = false; break; - + default: Base.log('Invalid Exif data: Invalid byte alignment marker.'); return; } - + // Check for the TIFF tag marker (0x002A): if ( dataView.getUint16( tiffOffset + 2, littleEndian ) !== 0x002A ) { Base.log('Invalid Exif data: Missing TIFF marker.'); return; } - + // Retrieve the directory offset bytes, usually 0x00000008 or 8 decimal: dirOffset = dataView.getUint32( tiffOffset + 4, littleEndian ); // Create the exif object to store the tags: @@ -4933,7 +4933,7 @@ // offset to the next directory, usually the thumbnail directory: dirOffset = EXIF.parseExifTags( dataView, tiffOffset, tiffOffset + dirOffset, littleEndian, data ); - + // 尝试读取缩略图 // if ( dirOffset ) { // thumbnailData = {exif: {}}; @@ -4944,7 +4944,7 @@ // littleEndian, // thumbnailData // ); - + // // Check for JPEG Thumbnail offset: // if (thumbnailData.exif[0x0201]) { // data.exif.Thumbnail = EXIF.getExifThumbnail( @@ -4955,7 +4955,7 @@ // } // } }; - + ImageMeta.parsers[ 0xffe1 ].push( EXIF.parseExifData ); return EXIF; }); @@ -4967,26 +4967,26 @@ * @fileOverview jpeg encoder */ define('runtime/html5/jpegencoder',[], function( require, exports, module ) { - + /* Copyright (c) 2008, Adobe Systems Incorporated All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + * Neither the name of Adobe Systems Incorporated nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR @@ -5001,10 +5001,10 @@ */ /* JPEG encoder ported to JavaScript and optimized by Andreas Ritter, www.bytestrom.eu, 11/2009 - + Basic GUI blocking jpeg encoder */ - + function JPEGEncoder(quality) { var self = this; var fround = Math.round; @@ -5017,7 +5017,7 @@ var UVDC_HT; var YAC_HT; var UVAC_HT; - + var bitcode = new Array(65535); var category = new Array(65535); var outputfDCTQuant = new Array(64); @@ -5025,14 +5025,14 @@ var byteout = []; var bytenew = 0; var bytepos = 7; - + var YDU = new Array(64); var UDU = new Array(64); var VDU = new Array(64); var clt = new Array(256); var RGB_YUV_TABLE = new Array(2048); var currentQuality; - + var ZigZag = [ 0, 1, 5, 6,14,15,27,28, 2, 4, 7,13,16,26,29,42, @@ -5043,7 +5043,7 @@ 21,34,37,47,50,56,59,61, 35,36,48,49,57,58,62,63 ]; - + var std_dc_luminance_nrcodes = [0,0,1,5,1,1,1,1,1,1,0,0,0,0,0,0,0]; var std_dc_luminance_values = [0,1,2,3,4,5,6,7,8,9,10,11]; var std_ac_luminance_nrcodes = [0,0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,0x7d]; @@ -5070,7 +5070,7 @@ 0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8, 0xf9,0xfa ]; - + var std_dc_chrominance_nrcodes = [0,0,3,1,1,1,1,1,1,1,1,1,0,0,0,0,0]; var std_dc_chrominance_values = [0,1,2,3,4,5,6,7,8,9,10,11]; var std_ac_chrominance_nrcodes = [0,0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,0x77]; @@ -5097,7 +5097,7 @@ 0xea,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8, 0xf9,0xfa ]; - + function initQuantTables(sf){ var YQT = [ 16, 11, 10, 16, 24, 40, 51, 61, @@ -5109,7 +5109,7 @@ 49, 64, 78, 87,103,121,120,101, 72, 92, 95, 98,112,100,103, 99 ]; - + for (var i = 0; i < 64; i++) { var t = ffloor((YQT[i]*sf+50)/100); if (t < 1) { @@ -5153,7 +5153,7 @@ } } } - + function computeHuffmanTbl(nrcodes, std_table){ var codevalue = 0; var pos_in_table = 0; @@ -5170,7 +5170,7 @@ } return HT; } - + function initHuffmanTbl() { YDC_HT = computeHuffmanTbl(std_dc_luminance_nrcodes,std_dc_luminance_values); @@ -5178,7 +5178,7 @@ YAC_HT = computeHuffmanTbl(std_ac_luminance_nrcodes,std_ac_luminance_values); UVAC_HT = computeHuffmanTbl(std_ac_chrominance_nrcodes,std_ac_chrominance_values); } - + function initCategoryNumber() { var nrlower = 1; @@ -5202,7 +5202,7 @@ nrupper <<= 1; } } - + function initRGBYUVTable() { for(var i = 0; i < 256;i++) { RGB_YUV_TABLE[i] = 19595 * i; @@ -5215,7 +5215,7 @@ RGB_YUV_TABLE[(i+1792)>>0] = - 5329 * i; } } - + // IO functions function writeBits(bs) { @@ -5240,18 +5240,18 @@ } } } - + function writeByte(value) { byteout.push(clt[value]); // write char directly instead of converting later } - + function writeWord(value) { writeByte((value>>8)&0xFF); writeByte((value )&0xFF); } - + // DCT & quantization core function fDCTQuant(data, fdtbl) { @@ -5271,7 +5271,7 @@ d5 = data[dataOff+5]; d6 = data[dataOff+6]; d7 = data[dataOff+7]; - + var tmp0 = d0 + d7; var tmp7 = d0 - d7; var tmp1 = d1 + d6; @@ -5280,42 +5280,42 @@ var tmp5 = d2 - d5; var tmp3 = d3 + d4; var tmp4 = d3 - d4; - + /* Even part */ var tmp10 = tmp0 + tmp3; /* phase 2 */ var tmp13 = tmp0 - tmp3; var tmp11 = tmp1 + tmp2; var tmp12 = tmp1 - tmp2; - + data[dataOff] = tmp10 + tmp11; /* phase 3 */ data[dataOff+4] = tmp10 - tmp11; - + var z1 = (tmp12 + tmp13) * 0.707106781; /* c4 */ data[dataOff+2] = tmp13 + z1; /* phase 5 */ data[dataOff+6] = tmp13 - z1; - + /* Odd part */ tmp10 = tmp4 + tmp5; /* phase 2 */ tmp11 = tmp5 + tmp6; tmp12 = tmp6 + tmp7; - + /* The rotator is modified from fig 4-8 to avoid extra negations. */ var z5 = (tmp10 - tmp12) * 0.382683433; /* c6 */ var z2 = 0.541196100 * tmp10 + z5; /* c2-c6 */ var z4 = 1.306562965 * tmp12 + z5; /* c2+c6 */ var z3 = tmp11 * 0.707106781; /* c4 */ - + var z11 = tmp7 + z3; /* phase 5 */ var z13 = tmp7 - z3; - + data[dataOff+5] = z13 + z2; /* phase 6 */ data[dataOff+3] = z13 - z2; data[dataOff+1] = z11 + z4; data[dataOff+7] = z11 - z4; - + dataOff += 8; /* advance pointer to next row */ } - + /* Pass 2: process columns. */ dataOff = 0; for (i=0; i 0.0) ? ((fDCTQuant + 0.5)|0) : ((fDCTQuant - 0.5)|0); //outputfDCTQuant[i] = fround(fDCTQuant); - + } return outputfDCTQuant; } - + function writeAPP0() { writeWord(0xFFE0); // marker @@ -5403,7 +5403,7 @@ writeByte(0); // thumbnwidth writeByte(0); // thumbnheight } - + function writeSOF0(width, height) { writeWord(0xFFC0); // marker @@ -5422,7 +5422,7 @@ writeByte(0x11); // HVV writeByte(1); // QTV } - + function writeDQT() { writeWord(0xFFDB); // marker @@ -5436,12 +5436,12 @@ writeByte(UVTable[j]); } } - + function writeDHT() { writeWord(0xFFC4); // marker writeWord(0x01A2); // length - + writeByte(0); // HTYDCinfo for (var i=0; i<16; i++) { writeByte(std_dc_luminance_nrcodes[i+1]); @@ -5449,7 +5449,7 @@ for (var j=0; j<=11; j++) { writeByte(std_dc_luminance_values[j]); } - + writeByte(0x10); // HTYACinfo for (var k=0; k<16; k++) { writeByte(std_ac_luminance_nrcodes[k+1]); @@ -5457,7 +5457,7 @@ for (var l=0; l<=161; l++) { writeByte(std_ac_luminance_values[l]); } - + writeByte(1); // HTUDCinfo for (var m=0; m<16; m++) { writeByte(std_dc_chrominance_nrcodes[m+1]); @@ -5465,7 +5465,7 @@ for (var n=0; n<=11; n++) { writeByte(std_dc_chrominance_values[n]); } - + writeByte(0x11); // HTUACinfo for (var o=0; o<16; o++) { writeByte(std_ac_chrominance_nrcodes[o+1]); @@ -5474,7 +5474,7 @@ writeByte(std_ac_chrominance_values[p]); } } - + function writeSOS() { writeWord(0xFFDA); // marker @@ -5490,7 +5490,7 @@ writeByte(0x3f); // Se writeByte(0); // Bf } - + function processDU(CDU, fdtbl, DC, HTDC, HTAC){ var EOB = HTAC[0x00]; var M16zeroes = HTAC[0xF0]; @@ -5542,25 +5542,25 @@ } return DC; } - + function initCharLookupTable(){ var sfcc = String.fromCharCode; for(var i=0; i < 256; i++){ ///// ACHTUNG // 255 clt[i] = sfcc(i); } } - + this.encode = function(image,quality) // image data object { // var time_start = new Date().getTime(); - + if(quality) setQuality(quality); - + // Initialize bit writer byteout = new Array(); bytenew=0; bytepos=7; - + // Add JPEG headers writeWord(0xFFD8); // SOI writeAPP0(); @@ -5568,26 +5568,26 @@ writeSOF0(image.width,image.height); writeDHT(); writeSOS(); - - + + // Encode 8x8 macroblocks var DCY=0; var DCU=0; var DCV=0; - + bytenew=0; bytepos=7; - - + + this.encode.displayName = "_encode_"; - + var imageData = image.data; var width = image.width; var height = image.height; - + var quadWidth = width*4; var tripleWidth = width*3; - + var x, y = 0; var r, g, b; var start,p, col,row,pos; @@ -5598,38 +5598,38 @@ p = start; col = -1; row = 0; - + for(pos=0; pos < 64; pos++){ row = pos >> 3;// /8 col = ( pos & 7 ) * 4; // %8 p = start + ( row * quadWidth ) + col; - + if(y+row >= height){ // padding bottom p-= (quadWidth*(y+1+row-height)); } - + if(x+col >= quadWidth){ // padding right p-= ((x+col) - quadWidth +4) } - + r = imageData[ p++ ]; g = imageData[ p++ ]; b = imageData[ p++ ]; - - + + /* // calculate YUV values dynamically YDU[pos]=((( 0.29900)*r+( 0.58700)*g+( 0.11400)*b))-128; //-0x80 UDU[pos]=(((-0.16874)*r+(-0.33126)*g+( 0.50000)*b)); VDU[pos]=((( 0.50000)*r+(-0.41869)*g+(-0.08131)*b)); */ - + // use lookup table (slightly faster) YDU[pos] = ((RGB_YUV_TABLE[r] + RGB_YUV_TABLE[(g + 256)>>0] + RGB_YUV_TABLE[(b + 512)>>0]) >> 16)-128; UDU[pos] = ((RGB_YUV_TABLE[(r + 768)>>0] + RGB_YUV_TABLE[(g + 1024)>>0] + RGB_YUV_TABLE[(b + 1280)>>0]) >> 16)-128; VDU[pos] = ((RGB_YUV_TABLE[(r + 1280)>>0] + RGB_YUV_TABLE[(g + 1536)>>0] + RGB_YUV_TABLE[(b + 1792)>>0]) >> 16)-128; - + } - + DCY = processDU(YDU, fdtbl_Y, DCY, YDC_HT, YAC_HT); DCU = processDU(UDU, fdtbl_UV, DCU, UVDC_HT, UVAC_HT); DCV = processDU(VDU, fdtbl_UV, DCV, UVDC_HT, UVAC_HT); @@ -5637,10 +5637,10 @@ } y+=8; } - - + + //////////////////////////////////////////////////////////////// - + // Do the bit alignment of the EOI marker if ( bytepos >= 0 ) { var fillbits = []; @@ -5648,21 +5648,21 @@ fillbits[0] = (1<<(bytepos+1))-1; writeBits(fillbits); } - + writeWord(0xFFD9); //EOI - + var jpegDataUri = 'data:image/jpeg;base64,' + btoa(byteout.join('')); - + byteout = []; - + // benchmarking // var duration = new Date().getTime() - time_start; // console.log('Encoding time: '+ currentQuality + 'ms'); // - + return jpegDataUri } - + function setQuality(quality){ if (quality <= 0) { quality = 1; @@ -5670,21 +5670,21 @@ if (quality > 100) { quality = 100; } - + if(currentQuality == quality) return // don't recalc if unchanged - + var sf = 0; if (quality < 50) { sf = Math.floor(5000 / quality); } else { sf = Math.floor(200 - quality*2); } - + initQuantTables(sf); currentQuality = quality; // console.log('Quality set to: '+quality +'%'); } - + function init(){ // var time_start = new Date().getTime(); if(!quality) quality = 50; @@ -5693,22 +5693,22 @@ initHuffmanTbl(); initCategoryNumber(); initRGBYUVTable(); - + setQuality(quality); // var duration = new Date().getTime() - time_start; // console.log('Initialization '+ duration + 'ms'); } - + init(); - + }; - + JPEGEncoder.encode = function( data, quality ) { var encoder = new JPEGEncoder( quality ); - + return encoder.encode( data ); } - + return JPEGEncoder; }); /** @@ -5721,43 +5721,43 @@ ], function( Util, encoder, Base ) { var origin = Util.canvasToDataUrl, supportJpeg; - + Util.canvasToDataUrl = function( canvas, type, quality ) { var ctx, w, h, fragement, parts; - + // 非android手机直接跳过。 if ( !Base.os.android ) { return origin.apply( null, arguments ); } - + // 检测是否canvas支持jpeg导出，根据数据格式来判断。 // JPEG 前两位分别是：255, 216 if ( type === 'image/jpeg' && typeof supportJpeg === 'undefined' ) { fragement = origin.apply( null, arguments ); - + parts = fragement.split(','); - + if ( ~parts[ 0 ].indexOf('base64') ) { fragement = atob( parts[ 1 ] ); } else { fragement = decodeURIComponent( parts[ 1 ] ); } - + fragement = fragement.substring( 0, 2 ); - + supportJpeg = fragement.charCodeAt( 0 ) === 255 && fragement.charCodeAt( 1 ) === 216; } - + // 只有在android环境下才修复 if ( type === 'image/jpeg' && !supportJpeg ) { w = canvas.width; h = canvas.height; ctx = canvas.getContext('2d'); - + return encoder.encode( ctx.getImageData( 0, 0, w, h ), quality ); } - + return origin.apply( null, arguments ); }; }); @@ -5769,26 +5769,26 @@ 'runtime/html5/runtime', 'runtime/html5/util' ], function( Base, Html5Runtime, Util ) { - + var BLANK = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D'; - + return Html5Runtime.register( 'Image', { - + // flag: 标记是否被修改过。 modified: false, - + init: function() { var me = this, img = new Image(); - + img.onload = function() { - + me._info = { type: me.type, width: this.width, height: this.height }; - + // 读取meta信息。 if ( !me._metas && 'image/jpeg' === me.type ) { Util.parseMeta( me._blob, function( error, ret ) { @@ -5799,18 +5799,18 @@ me.owner.trigger('load'); } }; - + img.onerror = function() { me.owner.trigger('error'); }; - + me._img = img; }, - + loadFromBlob: function( blob ) { var me = this, img = me._img; - + me._blob = blob; me.type = blob.type; img.src = Util.createObjectURL( blob.getSource() ); @@ -5818,36 +5818,36 @@ Util.revokeObjectURL( img.src ); }); }, - + resize: function( width, height ) { var canvas = this._canvas || (this._canvas = document.createElement('canvas')); - + this._resize( this._img, canvas, width, height ); this._blob = null; // 没用了，可以删掉了。 this.modified = true; this.owner.trigger('complete'); }, - + getAsBlob: function( type ) { var blob = this._blob, opts = this.options, canvas; - + type = type || this.type; - + // blob需要重新生成。 if ( this.modified || this.type !== type ) { canvas = this._canvas; - + if ( type === 'image/jpeg' ) { - + blob = Util.canvasToDataUrl( canvas, 'image/jpeg', opts.quality ); - + if ( opts.preserveHeaders && this._metas && this._metas.imageHead ) { - + blob = Util.dataURL2ArrayBuffer( blob ); blob = Util.updateImageHead( blob, this._metas.imageHead ); @@ -5857,95 +5857,95 @@ } else { blob = Util.canvasToDataUrl( canvas, type ); } - + blob = Util.dataURL2Blob( blob ); } - + return blob; }, - + getAsDataUrl: function( type ) { var opts = this.options; - + type = type || this.type; - + if ( type === 'image/jpeg' ) { return Util.canvasToDataUrl( this._canvas, type, opts.quality ); } else { return this._canvas.toDataURL( type ); } }, - + getOrientation: function() { return this._metas && this._metas.exif && this._metas.exif.get('Orientation') || 1; }, - + info: function( val ) { - + // setter if ( val ) { this._info = val; return this; } - + // getter return this._info; }, - + meta: function( val ) { - + // setter if ( val ) { this._meta = val; return this; } - + // getter return this._meta; }, - + destroy: function() { var canvas = this._canvas; this._img.onload = null; - + if ( canvas ) { canvas.getContext('2d') .clearRect( 0, 0, canvas.width, canvas.height ); canvas.width = canvas.height = 0; this._canvas = null; } - + // 释放内存。非常重要，否则释放不了image的内存。 this._img.src = BLANK; this._img = this._blob = null; }, - + _resize: function( img, cvs, width, height ) { var opts = this.options, naturalWidth = img.width, naturalHeight = img.height, orientation = this.getOrientation(), scale, w, h, x, y; - + // values that require 90 degree rotation if ( ~[ 5, 6, 7, 8 ].indexOf( orientation ) ) { - + // 交换width, height的值。 width ^= height; height ^= width; width ^= height; } - + scale = Math[ opts.crop ? 'max' : 'min' ]( width / naturalWidth, height / naturalHeight ); - + // 不允许放大。 opts.allowMagnify || (scale = Math.min( 1, scale )); - + w = naturalWidth * scale; h = naturalHeight * scale; - + if ( opts.crop ) { cvs.width = width; cvs.height = height; @@ -5953,20 +5953,20 @@ cvs.width = w; cvs.height = h; } - + x = (cvs.width - w) / 2; y = (cvs.height - h) / 2; - + opts.preserveHeaders || this._rotate2Orientaion( cvs, orientation ); - + this._renderImageToCanvas( cvs, img, x, y, w, h ); }, - + _rotate2Orientaion: function( canvas, orientation ) { var width = canvas.width, height = canvas.height, ctx = canvas.getContext('2d'); - + switch ( orientation ) { case 5: case 6: @@ -5976,57 +5976,57 @@ canvas.height = width; break; } - + switch ( orientation ) { case 2: // horizontal flip ctx.translate( width, 0 ); ctx.scale( -1, 1 ); break; - + case 3: // 180 rotate left ctx.translate( width, height ); ctx.rotate( Math.PI ); break; - + case 4: // vertical flip ctx.translate( 0, height ); ctx.scale( 1, -1 ); break; - + case 5: // vertical flip + 90 rotate right ctx.rotate( 0.5 * Math.PI ); ctx.scale( 1, -1 ); break; - + case 6: // 90 rotate right ctx.rotate( 0.5 * Math.PI ); ctx.translate( 0, -height ); break; - + case 7: // horizontal flip + 90 rotate right ctx.rotate( 0.5 * Math.PI ); ctx.translate( width, -height ); ctx.scale( -1, 1 ); break; - + case 8: // 90 rotate left ctx.rotate( -0.5 * Math.PI ); ctx.translate( -width, 0 ); break; } }, - + // https://github.com/stomita/ios-imagefile-megapixel/ // blob/master/src/megapix-image.js _renderImageToCanvas: (function() { - + // 如果不是ios, 不需要这么复杂！ if ( !Base.os.ios ) { return function( canvas, img, x, y, w, h ) { canvas.getContext('2d').drawImage( img, x, y, w, h ); }; } - + /** * Detecting vertical squash in loaded image. * Fixes a bug which squash image vertically while drawing into @@ -6039,31 +6039,31 @@ ey = ih, py = ih, data, alpha, ratio; - - + + canvas.width = 1; canvas.height = ih; ctx.drawImage( img, 0, 0 ); data = ctx.getImageData( 0, 0, 1, ih ).data; - + // search image edge pixel position in case // it is squashed vertically. while ( py > sy ) { alpha = data[ (py - 1) * 4 + 3 ]; - + if ( alpha === 0 ) { ey = py; } else { sy = py; } - + py = (ey + sy) >> 1; } - + ratio = (py / ih); return (ratio === 0) ? 1 : ratio; } - + // fix ie7 bug // http://stackoverflow.com/questions/11929099/ // html5-canvas-drawimage-ratio-bug-ios @@ -6072,13 +6072,13 @@ var iw = img.naturalWidth, ih = img.naturalHeight, vertSquashRatio = detectVerticalSquash( img, iw, ih ); - + return canvas.getContext('2d').drawImage( img, 0, 0, iw * vertSquashRatio, ih * vertSquashRatio, x, y, w, h ); }; } - + /** * Detect subsampling in loaded image. * In iOS, larger images than 2M pixels may be @@ -6088,14 +6088,14 @@ var iw = img.naturalWidth, ih = img.naturalHeight, canvas, ctx; - + // subsampling may happen overmegapixel image if ( iw * ih > 1024 * 1024 ) { canvas = document.createElement('canvas'); canvas.width = canvas.height = 1; ctx = canvas.getContext('2d'); ctx.drawImage( img, -iw + 1, 0 ); - + // subsampled image becomes half smaller in rendering size. // check alpha channel value to confirm image is covering // edge pixel or not. if alpha value is 0 @@ -6105,8 +6105,8 @@ return false; } } - - + + return function( canvas, img, x, y, width, height ) { var iw = img.naturalWidth, ih = img.naturalHeight, @@ -6117,23 +6117,23 @@ sy = 0, dy = 0, tmpCanvas, tmpCtx, vertSquashRatio, dw, dh, sx, dx; - + if ( subsampled ) { iw /= 2; ih /= 2; } - + ctx.save(); tmpCanvas = document.createElement('canvas'); tmpCanvas.width = tmpCanvas.height = d; - + tmpCtx = tmpCanvas.getContext('2d'); vertSquashRatio = doSquash ? detectVerticalSquash( img, iw, ih ) : 1; - + dw = Math.ceil( d * width / iw ); dh = Math.ceil( d * height / ih / vertSquashRatio ); - + while ( sy < ih ) { sx = 0; dx = 0; @@ -6164,16 +6164,16 @@ 'base', 'runtime/html5/runtime' ], function( Base, Html5Runtime ) { - + var noop = Base.noop, $ = Base.$; - + return Html5Runtime.register( 'Transport', { init: function() { this._status = 0; this._response = null; }, - + send: function() { var owner = this.owner, opts = this.options, @@ -6181,46 +6181,46 @@ blob = owner._blob, server = opts.server, formData, binary, fr; - + if ( opts.sendAsBinary ) { server += (/\?/.test( server ) ? '&' : '?') + $.param( owner._formData ); - + binary = blob.getSource(); } else { formData = new FormData(); $.each( owner._formData, function( k, v ) { formData.append( k, v ); }); - + formData.append( opts.fileVal, blob.getSource(), opts.filename || owner._formData.name || '' ); } - + if ( opts.withCredentials && 'withCredentials' in xhr ) { xhr.open( opts.method, server, true ); xhr.withCredentials = true; } else { xhr.open( opts.method, server ); } - + this._setRequestHeader( xhr, opts.headers ); - + if ( binary ) { xhr.overrideMimeType('application/octet-stream'); - + // android直接发送blob会导致服务端接收到的是空文件。 // bug详情。 // https://code.google.com/p/android/issues/detail?id=39882 // 所以先用fileReader读取出来再通过arraybuffer的方式发送。 if ( Base.os.android ) { fr = new FileReader(); - + fr.onload = function() { xhr.send( this.result ); fr = fr.onload = null; }; - + fr.readAsArrayBuffer( binary ); } else { xhr.send( binary ); @@ -6229,66 +6229,66 @@ xhr.send( formData ); } }, - + getResponse: function() { return this._response; }, - + getResponseAsJson: function() { return this._parseJson( this._response ); }, - + getStatus: function() { return this._status; }, - + abort: function() { var xhr = this._xhr; - + if ( xhr ) { xhr.upload.onprogress = noop; xhr.onreadystatechange = noop; xhr.abort(); - + this._xhr = xhr = null; } }, - + destroy: function() { this.abort(); }, - + _initAjax: function() { var me = this, xhr = new XMLHttpRequest(), opts = this.options; - + if ( opts.withCredentials && !('withCredentials' in xhr) && typeof XDomainRequest !== 'undefined' ) { xhr = new XDomainRequest(); } - + xhr.upload.onprogress = function( e ) { var percentage = 0; - + if ( e.lengthComputable ) { percentage = e.loaded / e.total; } - + return me.trigger( 'progress', percentage ); }; - + xhr.onreadystatechange = function() { - + if ( xhr.readyState !== 4 ) { return; } - + xhr.upload.onprogress = noop; xhr.onreadystatechange = noop; me._xhr = null; me._status = xhr.status; - + if ( xhr.status >= 200 && xhr.status < 300 ) { me._response = xhr.responseText; return me.trigger('load'); @@ -6296,30 +6296,30 @@ me._response = xhr.responseText; return me.trigger( 'error', 'server' ); } - - + + return me.trigger( 'error', me._status ? 'http' : 'abort' ); }; - + me._xhr = xhr; return xhr; }, - + _setRequestHeader: function( xhr, headers ) { $.each( headers, function( key, val ) { xhr.setRequestHeader( key, val ); }); }, - + _parseJson: function( str ) { var json; - + try { json = JSON.parse( str ); } catch ( ex ) { json = {}; } - + return json; } }); @@ -6332,15 +6332,15 @@ 'runtime/runtime', 'runtime/compbase' ], function( Base, Runtime, CompBase ) { - + var $ = Base.$, type = 'flash', components = {}; - - + + function getFlashVersion() { var version; - + try { version = navigator.plugins[ 'Shockwave Flash' ]; version = version.description; @@ -6355,96 +6355,96 @@ version = version.match( /\d+/g ); return parseFloat( version[ 0 ] + '.' + version[ 1 ], 10 ); } - + function FlashRuntime() { var pool = {}, clients = {}, destory = this.destory, me = this, jsreciver = Base.guid('webuploader_'); - + Runtime.apply( me, arguments ); me.type = type; - - + + // 这个方法的调用者，实际上是RuntimeClient me.exec = function( comp, fn/*, args...*/ ) { var client = this, uid = client.uid, args = Base.slice( arguments, 2 ), instance; - + clients[ uid ] = client; - + if ( components[ comp ] ) { if ( !pool[ uid ] ) { pool[ uid ] = new components[ comp ]( client, me ); } - + instance = pool[ uid ]; - + if ( instance[ fn ] ) { return instance[ fn ].apply( instance, args ); } } - + return me.flashExec.apply( client, arguments ); }; - + function handler( evt, obj ) { var type = evt.type || evt, parts, uid; - + parts = type.split('::'); uid = parts[ 0 ]; type = parts[ 1 ]; - + // console.log.apply( console, arguments ); - + if ( type === 'Ready' && uid === me.uid ) { me.trigger('ready'); } else if ( clients[ uid ] ) { clients[ uid ].trigger( type.toLowerCase(), evt, obj ); } - + // Base.log( evt, obj ); } - + // flash的接受器。 window[ jsreciver ] = function() { var args = arguments; - + // 为了能捕获得到。 setTimeout(function() { handler.apply( null, args ); }, 1 ); }; - + this.jsreciver = jsreciver; - + this.destory = function() { // @todo 删除池子中的所有实例 return destory && destory.apply( this, arguments ); }; - + this.flashExec = function( comp, fn ) { var flash = me.getFlash(), args = Base.slice( arguments, 2 ); - + return flash.exec( this.uid, comp, fn, args ); }; - + // @todo } - + Base.inherits( Runtime, { constructor: FlashRuntime, - + init: function() { var container = this.getContainer(), opts = this.options, html; - + // if not the minimal height, shims are not initialized // in older browsers (e.g FF3.6, IE6,7,8, Safari 4.0,5.0, etc) container.css({ @@ -6455,15 +6455,15 @@ height: '9px', overflow: 'hidden' }); - + // insert flash object html = '' + '' + '' + ''; - + container.html( html ); }, - + getFlash: function() { if ( this._flash ) { return this._flash; } - + this._flash = $( '#' + this.uid ).get( 0 ); return this._flash; } - + }); - + FlashRuntime.register = function( name, component ) { component = components[ name ] = Base.inherits( CompBase, $.extend({ - + // @todo fix this later flashExec: function() { var owner = this.owner, runtime = this.getRuntime(); - + return runtime.flashExec.apply( owner, arguments ); } }, component ) ); - + return component; }; - + if ( getFlashVersion() >= 11.4 ) { Runtime.addRuntime( type, FlashRuntime ); } - + return FlashRuntime; }); /** @@ -6515,12 +6515,12 @@ 'runtime/flash/runtime' ], function( Base, FlashRuntime ) { var $ = Base.$; - + return FlashRuntime.register( 'FilePicker', { init: function( opts ) { var copy = $.extend({}, opts ), len, i; - + // 修复Flash再没有设置title的情况下无法弹出flash文件选择框的bug. len = copy.accept && copy.accept.length; for ( i = 0; i < len; i++ ) { @@ -6528,13 +6528,13 @@ copy.accept[ i ].title = 'Files'; } } - + delete copy.button; delete copy.container; - + this.flashExec( 'FilePicker', 'init', copy ); }, - + destroy: function() { // todo } @@ -6546,23 +6546,23 @@ define('runtime/flash/image',[ 'runtime/flash/runtime' ], function( FlashRuntime ) { - + return FlashRuntime.register( 'Image', { // init: function( options ) { // var owner = this.owner; - + // this.flashExec( 'Image', 'init', options ); // owner.on( 'load', function() { - // debugger; + // ; // }); // }, - + loadFromBlob: function( blob ) { var owner = this.owner; - + owner.info() && this.flashExec( 'Image', 'info', owner.info() ); owner.meta() && this.flashExec( 'Image', 'meta', owner.meta() ); - + this.flashExec( 'Image', 'loadFromBlob', blob.uid ); } }); @@ -6576,14 +6576,14 @@ 'runtime/client' ], function( Base, FlashRuntime, RuntimeClient ) { var $ = Base.$; - + return FlashRuntime.register( 'Transport', { init: function() { this._status = 0; this._response = null; this._responseJson = null; }, - + send: function() { var owner = this.owner, opts = this.options, @@ -6591,71 +6591,71 @@ blob = owner._blob, server = opts.server, binary; - + xhr.connectRuntime( blob.ruid ); - + if ( opts.sendAsBinary ) { server += (/\?/.test( server ) ? '&' : '?') + $.param( owner._formData ); - + binary = blob.uid; } else { $.each( owner._formData, function( k, v ) { xhr.exec( 'append', k, v ); }); - + xhr.exec( 'appendBlob', opts.fileVal, blob.uid, opts.filename || owner._formData.name || '' ); } - + this._setRequestHeader( xhr, opts.headers ); xhr.exec( 'send', { method: opts.method, url: server }, binary ); }, - + getStatus: function() { return this._status; }, - + getResponse: function() { return this._response; }, - + getResponseAsJson: function() { return this._responseJson; }, - + abort: function() { var xhr = this._xhr; - + if ( xhr ) { xhr.exec('abort'); xhr.destroy(); this._xhr = xhr = null; } }, - + destroy: function() { this.abort(); }, - + _initAjax: function() { var me = this, xhr = new RuntimeClient('XMLHttpRequest'); - + xhr.on( 'uploadprogress progress', function( e ) { return me.trigger( 'progress', e.loaded / e.total ); }); - + xhr.on( 'load', function() { var status = xhr.exec('getStatus'), err = ''; - + xhr.off(); me._xhr = null; - + if ( status >= 200 && status < 300 ) { me._response = xhr.exec('getResponse'); me._responseJson = xhr.exec('getResponseAsJson'); @@ -6666,23 +6666,23 @@ } else { err = 'http'; } - + xhr.destroy(); xhr = null; - + return err ? me.trigger( 'error', err ) : me.trigger('load'); }); - + xhr.on( 'error', function() { xhr.off(); me._xhr = null; me.trigger( 'error', 'http' ); }); - + me._xhr = xhr; return xhr; }, - + _setRequestHeader: function( xhr, headers ) { $.each( headers, function( key, val ) { xhr.exec( 'setRequestHeader', key, val ); @@ -6695,7 +6695,7 @@ */ define('preset/all',[ 'base', - + // widgets 'widgets/filednd', 'widgets/filepaste', @@ -6705,7 +6705,7 @@ 'widgets/runtime', 'widgets/upload', 'widgets/validator', - + // runtimes // html5 'runtime/html5/blob', @@ -6716,7 +6716,7 @@ 'runtime/html5/androidpatch', 'runtime/html5/image', 'runtime/html5/transport', - + // flash 'runtime/flash/filepicker', 'runtime/flash/image',