From 8724a444c8a1d09dc8f9efd005e8443aad8df1ab Mon Sep 17 00:00:00 2001 From: Sanakey <714737083@qq.com> Date: 星期五, 30 四月 2021 18:19:26 +0800 Subject: [PATCH] 新增直播相关功能 --- pages/liveRoomGoods/liveRoomGoods.js | 207 +++++++++++++++++++++++++-------------------------- 1 files changed, 101 insertions(+), 106 deletions(-) diff --git a/pages/liveRoomGoods/liveRoomGoods.js b/pages/liveRoomGoods/liveRoomGoods.js index bc89b5e..6bdf41b 100644 --- a/pages/liveRoomGoods/liveRoomGoods.js +++ b/pages/liveRoomGoods/liveRoomGoods.js @@ -37,71 +37,31 @@ var eventChannel; Page({ data: { - result: [], + goodsList: [], roomid: '' - }, - onChange: function (event) { - this.setData({ - result: event.detail - }); - }, - noop: function () { }, - checkboxToggle: function (event) { - var index = event.currentTarget.dataset.index; - var checkbox = this.selectComponent(".checkboxes-" + index); - checkbox.toggle(); - }, - enter: function () { - return __awaiter(this, void 0, void 0, function () { - var goodsid, roomid, _a, err, res; - var _this = this; - return __generator(this, function (_b) { - switch (_b.label) { - case 0: - goodsid = this.data.result.join(); - roomid = this.data.roomid; - console.log(this.data.result); - return [4, wx.$utils.to(wx.$http.request({ - url: '/shopping/live/addGoodsToRoom.do', - data: { - roomid: roomid, - goodsid: goodsid - } - }))]; - case 1: - _a = _b.sent(), err = _a[0], res = _a[1]; - if (err) { - console.log(err); - return [2]; - } - console.log(res); - wx.showToast({ - title: '璁剧疆鎴愬姛', - icon: 'success', - duration: 2000 - }); - setTimeout(function () { - _this.cancle(); - }, 2000); - return [2]; - } - }); - }); }, getGoodsList: function () { return __awaiter(this, void 0, void 0, function () { - var _a, errMsg, res; + var _a, error, result; return __generator(this, function (_b) { switch (_b.label) { case 0: return [4, wx.$utils.to(wx.$http.request({ - url: '/shopping/live/getGoodsList.do', + url: '/shopping/panicBuyingLive/goodsListInRoom.do', data: { roomid: this.data.roomid } }))]; case 1: - _a = _b.sent(), errMsg = _a[0], res = _a[1]; - return [2, [errMsg, res]]; + _a = _b.sent(), error = _a[0], result = _a[1]; + if (error) { + console.log(error); + return [2]; + } + console.log(result); + this.setData({ + goodsList: result.list + }); + return [2]; } }); }); @@ -110,48 +70,12 @@ return __awaiter(this, void 0, void 0, function () { var roomid; return __generator(this, function (_a) { - switch (_a.label) { - case 0: - roomid = options.roomid || ''; - console.log('閾炬帴涓殑roomid', roomid); - this.setData({ - roomid: roomid - }); - return [4, this.handleGoodsList()]; - case 1: - _a.sent(); - return [2]; - } - }); - }); - }, - handleGoodsList: function () { - return __awaiter(this, void 0, void 0, function () { - var _a, errMsg, goodsList, result; - return __generator(this, function (_b) { - switch (_b.label) { - case 0: return [4, this.getGoodsList()]; - case 1: - _a = _b.sent(), errMsg = _a[0], goodsList = _a[1]; - if (errMsg) { - return [2]; - } - this.setData({ - goodsList: goodsList.list - }); - console.log('鍟嗗搧', goodsList.list); - result = []; - goodsList.list.forEach(function (item) { - if (item.isAddedToRoom) { - result.push(item.GoodsId.toString()); - } - }); - console.log(result); - this.setData({ - result: result - }); - return [2]; - } + roomid = options.roomid || ''; + console.log('閾炬帴涓殑roomid', roomid); + this.setData({ + roomid: roomid + }); + return [2]; }); }); }, @@ -160,20 +84,91 @@ complete: function () { }, }); }, - goGoodsDetail: function (e) { - var url = e.currentTarget.dataset.url; - wx.navigateTo({ - url: "/" + url, + updateGoods: function (event) { + return __awaiter(this, void 0, void 0, function () { + var _a, _b, goodsid, index, onSale, roomid, _c, error, result; + return __generator(this, function (_d) { + switch (_d.label) { + case 0: + _b = event.currentTarget.dataset, goodsid = _b.goodsid, index = _b.index, onSale = _b.onSale; + roomid = this.data.roomid; + return [4, wx.$utils.to(wx.$http.request({ + url: "/shopping/live/updateGoodsToOnSaleInRoom.do", + data: { + roomid: roomid, + goodsid: goodsid, + onSale: onSale + } + }))]; + case 1: + _c = _d.sent(), error = _c[0], result = _c[1]; + if (error) { + console.log(error); + return [2]; + } + console.log(result); + if (result.state == 'success') { + this.setData((_a = {}, + _a["goodsList[" + [index] + "]"] = result.list[0], + _a)); + wx.showToast({ title: '鎴愬姛' }); + } + return [2]; + } + }); }); }, - catchClick: function () { }, - onReady: function () { + deleteGoodsInRoom: function (event) { + return __awaiter(this, void 0, void 0, function () { + var _a, goodsid, index, roomid; + var _this = this; + return __generator(this, function (_b) { + _a = event.currentTarget.dataset, goodsid = _a.goodsid, index = _a.index; + roomid = this.data.roomid; + wx.pro.showModal({ + title: '鎻愮ず', + content: '纭畾瑕佸垹闄よ鍟嗗搧鍚楋紵', + }).then(function (res) { return __awaiter(_this, void 0, void 0, function () { + var _a, error, result, goodsList; + return __generator(this, function (_b) { + switch (_b.label) { + case 0: + console.log(res); + if (!res.confirm) return [3, 2]; + console.log('纭'); + return [4, wx.$utils.to(wx.$http.request({ + url: "/shopping/live/deleteGoodsInRoom.do", + data: { + roomid: roomid, + goodsid: goodsid + } + }))]; + case 1: + _a = _b.sent(), error = _a[0], result = _a[1]; + if (error) { + console.log(error); + return [2]; + } + console.log(result); + if (result.state == 'success') { + goodsList = this.data.goodsList; + goodsList.splice(index, 1); + this.setData({ + goodsList: goodsList + }); + wx.showToast({ title: '鎴愬姛' }); + } + _b.label = 2; + case 2: return [2]; + } + }); + }); }); + return [2]; + }); + }); }, onShow: function () { + this.getGoodsList(); }, - onHide: function () { - }, - onUnload: function () { - } }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGl2ZVJvb21Hb29kcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImxpdmVSb29tR29vZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsSUFBSSxZQUFZLENBQUM7QUFDakIsSUFBSSxDQUFDO0lBS0gsSUFBSSxFQUFFO1FBQ0osTUFBTSxFQUFFLEVBQVk7UUFDcEIsTUFBTSxFQUFDLEVBQUU7S0FDVjtJQVNELFFBQVEsWUFBQyxLQUFTO1FBQ2hCLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDWCxNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU07U0FDckIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELElBQUksZ0JBQUcsQ0FBQztJQUNSLGNBQWMsWUFBQyxLQUFTO1FBQ2QsSUFBQSx5Q0FBSyxDQUFpQztRQUM5QyxJQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsZUFBZSxDQUFDLGlCQUFlLEtBQU8sQ0FBQyxDQUFDO1FBQzlELFFBQVEsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUNwQixDQUFDO0lBQ0ssS0FBSzs7Ozs7Ozt3QkFDTCxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUM7d0JBQ2xDLE1BQU0sR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQzt3QkFDOUIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxDQUFDO3dCQUViLFdBQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQ2pDLEVBQUUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDO2dDQUVmLEdBQUcsRUFBRSxrQ0FBa0M7Z0NBQ3ZDLElBQUksRUFBQztvQ0FDSCxNQUFNLFFBQUE7b0NBQ04sT0FBTyxTQUFBO2lDQUNSOzZCQUNGLENBQUMsQ0FDSCxFQUFBOzt3QkFURyxLQUFhLFNBU2hCLEVBVEksR0FBRyxRQUFB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QUFDO0lBS0QsUUFBUSxFQUFFO0lBRVYsQ0FBQztDQUNGLENBQUMsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL3FyQ29kZUxpc3QvcXJDb2RlTGlzdC5qc1xubGV0IGV2ZW50Q2hhbm5lbDtcblBhZ2Uoe1xuXG4gIC8qKlxuICAgKiDpobXpnaLnmoTliJ3lp4vmlbDmja5cbiAgICovXG4gIGRhdGE6IHtcbiAgICByZXN1bHQ6IFtdIGFzIGFueSBbXSxcbiAgICByb29taWQ6JydcbiAgfSxcblxuICAvLyBvbkNoYW5nZShldmVudCkge1xuICAvLyAgIHRoaXMuc2V0RGF0YSh7XG4gIC8vICAgICByYWRpbzogZXZlbnQuZGV0YWlsLFxuICAvLyAgIH0pO1xuICAvLyB9LFxuXG5cbiAgb25DaGFuZ2UoZXZlbnQ6YW55KSB7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHJlc3VsdDogZXZlbnQuZGV0YWlsXG4gICAgfSk7XG4gIH0sXG4gIG5vb3AoKXt9LFxuICBjaGVja2JveFRvZ2dsZShldmVudDphbnkpIHtcbiAgICBjb25zdCB7IGluZGV4IH0gPSBldmVudC5jdXJyZW50VGFyZ2V0LmRhdGFzZXQ7XG4gICAgY29uc3QgY2hlY2tib3ggPSB0aGlzLnNlbGVjdENvbXBvbmVudChgLmNoZWNrYm94ZXMtJHtpbmRleH1gKTtcbiAgICBjaGVja2JveC50b2dnbGUoKTtcbiAgfSxcbiAgYXN5bmMgZW50ZXIoKXtcbiAgICBsZXQgZ29vZHNpZCA9IHRoaXMuZGF0YS5yZXN1bHQuam9pbigpO1xuICAgIGxldCByb29taWQgPSB0aGlzLmRhdGEucm9vbWlkO1xuICAgIGNvbnNvbGUubG9nKHRoaXMuZGF0YS5yZXN1bHQpO1xuXG4gICAgbGV0IFtlcnIsIHJlc10gPSBhd2FpdCB3eC4kdXRpbHMudG8oXG4gICAgICB3eC4kaHR0cC5yZXF1ZXN0KHtcbiAgICAgICAgLy8gdXJsOiAnL3Nob3BwaW5nL2dldE1hdENvZGVMaXN0LmRvP2Zyb21kYXRhPTEwJyxcbiAgICAgICAgdXJsOiAnL3Nob3BwaW5nL2xpdmUvYWRkR29vZHNUb1Jvb20uZG8nLFxuICAgICAgICBkYXRhOntcbiAgICAgICAgICByb29taWQsXG4gICAgICAgICAgZ29vZHNpZFxuICAgICAgICB9XG4gICAgICB9KVxuICAgIClcbiAgICBpZiAoZXJyKSB7XG4gICAgICBjb25zb2xlLmxvZyhlcnIpO1xuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgIHd4LnNob3dUb2FzdCh7XG4gICAgICB0aXRsZTogJ+iuvue9ruaIkOWKnycsXG4gICAgICBpY29uOidzdWNjZXNzJyxcbiAgICAgIGR1cmF0aW9uOjIwMDBcbiAgICB9KVxuICAgIHNldFRpbWVvdXQoKCk9PntcbiAgICAgIHRoaXMuY2FuY2xlKCk7XG4gICAgfSwyMDAwKVxuICB9LFxuXG5cbiAgYXN5bmMgZ2V0R29vZHNMaXN0KCl7XG4gICAgLy8g6I635Y+W5o6o6I2Q5ZWG5ZOBXG4gICAgbGV0IFtlcnJNc2csIHJlc10gPSBhd2FpdCB3eC4kdXRpbHMudG8oXG4gICAgICB3eC4kaHR0cC5yZXF1ZXN0KHtcbiAgICAgICAgLy8gdXJsOiAnL3Nob3BwaW5nL2dldE1hdENvZGVMaXN0LmRvP2Zyb21kYXRhPTEwJyxcbiAgICAgICAgdXJsOiAnL3Nob3BwaW5nL2xpdmUvZ2V0R29vZHNMaXN0LmRvJyxcbiAgICAgICAgZGF0YTp7XG4gICAgICAgICAgcm9vbWlkOnRoaXMuZGF0YS5yb29taWRcbiAgICAgICAgfVxuICAgICAgfSlcbiAgICApXG4gICAgcmV0dXJuIFtlcnJNc2cscmVzXTtcbiAgfSxcblxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkOiBhc3luYyBmdW5jdGlvbiAob3B0aW9ucykge1xuICAgIGxldCByb29taWQgPSBvcHRpb25zLnJvb21pZHx8Jyc7XG4gICAgY29uc29sZS5sb2coJ+mTvuaOpeS4reeahHJvb21pZCcscm9vbWlkKTtcbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgcm9vbWlkXG4gICAgfSlcbiAgICBhd2FpdCB0aGlzLmhhbmRsZUdvb2RzTGlzdCgpXG4gIH0sXG5cblxuICBhc3luYyBoYW5kbGVHb29kc0xpc3QoKXtcbiAgICBsZXQgW2Vyck1zZywgZ29vZHNMaXN0XSA9IGF3YWl0IHRoaXMuZ2V0R29vZHNMaXN0KCk7XG4gICAgaWYgKGVyck1zZykge1xuICAgICAgcmV0dXJuO1xuICAgIH1cbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgZ29vZHNMaXN0Omdvb2RzTGlzdC5saXN0XG4gICAgfSlcbiAgICBjb25zb2xlLmxvZygn5ZWG5ZOBJyxnb29kc0xpc3QubGlzdClcbiAgICBsZXQgcmVzdWx0OiBhbnlbXSA9IFtdO1xuICAgIGdvb2RzTGlzdC5saXN0LmZvckVhY2goKGl0ZW06YW55KT0+e1xuICAgICAgaWYgKGl0ZW0uaXNBZGRlZFRvUm9vbSkge1xuICAgICAgICByZXN1bHQucHVzaChpdGVtLkdvb2RzSWQudG9TdHJpbmcoKSlcbiAgICAgIH1cbiAgICB9KVxuICAgIGNvbnNvbGUubG9nKHJlc3VsdCk7XG5cbiAgICB0aGlzLnNldERhdGEoe1xuICAgICAgcmVzdWx0XG4gICAgfSlcblxuICB9LFxuXG4gIGNhbmNsZSgpe1xuICAgIHd4Lm5hdmlnYXRlQmFjayh7XG4gICAgICBjb21wbGV0ZTogKCkgPT4ge30sXG4gICAgfSlcbiAgfSxcbiAgZ29Hb29kc0RldGFpbChlOmFueSkge1xuICAgIGxldCB1cmwgPSBlLmN1cnJlbnRUYXJnZXQuZGF0YXNldC51cmw7XG4gICAgd3gubmF2aWdhdGVUbyh7XG4gICAgICB1cmw6IGAvJHt1cmx9YCxcbiAgICB9KTtcbiAgfSxcbiAgY2F0Y2hDbGljaygpe30sXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWIneasoea4suafk+WujOaIkFxuICAgKi9cbiAgb25SZWFkeTogZnVuY3Rpb24gKCkge1xuXG4gIH0sXG5cbiAgLyoqXG4gICAqIOeUn+WRveWRqOacn+WHveaVsC0t55uR5ZCs6aG16Z2i5pi+56S6XG4gICAqL1xuICBvblNob3c6IGZ1bmN0aW9uICgpIHtcblxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdoumakOiXj1xuICAgKi9cbiAgb25IaWRlOiBmdW5jdGlvbiAoKSB7XG5cbiAgfSxcblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLljbjovb1cbiAgICovXG4gIG9uVW5sb2FkOiBmdW5jdGlvbiAoKSB7XG5cbiAgfVxufSlcbiJdfQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGl2ZVJvb21Hb29kcy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImxpdmVSb29tR29vZHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsSUFBSSxZQUFZLENBQUM7QUFDakIsSUFBSSxDQUFDO0lBS0gsSUFBSSxFQUFFO1FBQ0osU0FBUyxFQUFFLEVBQVk7UUFDdkIsTUFBTSxFQUFDLEVBQUU7S0FDVjtJQVVLLFlBQVk7Ozs7OzRCQUVNLFdBQU0sRUFBRSxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQ3RDLEVBQUUsQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDOzRCQUVmLEdBQUcsRUFBRSw4Q0FBOEM7NEJBQ25ELElBQUksRUFBQztnQ0FDSCxNQUFNLEVBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxNQUFNOzZCQUN4Qjt5QkFDRixDQUFDLENBQ0gsRUFBQTs7d0JBUkcsS0FBa0IsU0FRckIsRUFSSSxLQUFLLFFBQUEsRUFBRSxNQUFNLFFBQUE7d0JBU2xCLElBQUksS0FBSyxFQUFDOzRCQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUM7NEJBQ25CLFdBQU87eUJBQ1I7d0JBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQzt3QkFDcEIsSUFBSSxDQUFDLE9BQU8sQ0FBQzs0QkFDWCxTQUFTLEVBQUMsTUFBTSxDQUFDLElBQUk7eUJBQ3RCLENBQUMsQ0FBQTs7Ozs7S0FDSDtJQU1LLE1BQU0sWUFBQyxPQUFPOzs7O2dCQUNkLE1BQU0sR0FBRyxPQUFPLENBQUMsTUFBTSxJQUFFLEVBQUUsQ0FBQztnQkFDaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxZQUFZLEVBQUMsTUFBTSxDQUFDLENBQUM7Z0JBQ2pDLElBQUksQ0FBQyxPQUFPLENBQUM7b0JBQ1gsTUFBTSxRQUFBO2lCQUNQLENBQUMsQ0FBQTs7OztLQUNIO0lBR0QsTUFBTTtRQUNKLEVBQUUs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Qjs7Ozs7cUJBRUosQ0FBQyxDQUFDOzs7O0tBQ0o7SUFNRCxNQUFNO1FBQ0osSUFBSSxDQUFDLFlBQVksRUFBRSxDQUFBO0lBQ3JCLENBQUM7Q0FDRixDQUFDLENBQUEiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBwYWdlcy9xckNvZGVMaXN0L3FyQ29kZUxpc3QuanNcbmxldCBldmVudENoYW5uZWw7XG5QYWdlKHtcblxuICAvKipcbiAgICog6aG16Z2i55qE5Yid5aeL5pWw5o2uXG4gICAqL1xuICBkYXRhOiB7XG4gICAgZ29vZHNMaXN0OiBbXSBhcyBhbnkgW10sXG4gICAgcm9vbWlkOicnXG4gIH0sXG5cbiAgLy8gb25DaGFuZ2UoZXZlbnQpIHtcbiAgLy8gICB0aGlzLnNldERhdGEoe1xuICAvLyAgICAgcmFkaW86IGV2ZW50LmRldGFpbCxcbiAgLy8gICB9KTtcbiAgLy8gfSxcblxuXG5cbiAgYXN5bmMgZ2V0R29vZHNMaXN0KCl7XG4gICAgLy8g6I635Y+W5o6o6I2Q5ZWG5ZOBXG4gICAgbGV0IFtlcnJvciwgcmVzdWx0XSA9IGF3YWl0IHd4LiR1dGlscy50byhcbiAgICAgIHd4LiRodHRwLnJlcXVlc3Qoe1xuICAgICAgICAvLyB1cmw6ICcvc2hvcHBpbmcvZ2V0TWF0Q29kZUxpc3QuZG8/ZnJvbWRhdGE9MTAnLFxuICAgICAgICB1cmw6ICcvc2hvcHBpbmcvcGFuaWNCdXlpbmdMaXZlL2dvb2RzTGlzdEluUm9vbS5kbycsXG4gICAgICAgIGRhdGE6e1xuICAgICAgICAgIHJvb21pZDp0aGlzLmRhdGEucm9vbWlkXG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgKVxuICAgIGlmIChlcnJvcil7XG4gICAgICBjb25zb2xlLmxvZyhlcnJvcik7XG4gICAgICByZXR1cm47XG4gICAgfVxuICAgIGNvbnNvbGUubG9nKHJlc3VsdCk7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIGdvb2RzTGlzdDpyZXN1bHQubGlzdFxuICAgIH0pXG4gIH0sXG5cblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLliqDovb1cbiAgICovXG4gIGFzeW5jIG9uTG9hZChvcHRpb25zKSB7XG4gICAgbGV0IHJvb21pZCA9IG9wdGlvbnMucm9vbWlkfHwnJztcbiAgICBjb25zb2xlLmxvZygn6ZO+5o6l5Lit55qEcm9vbWlkJyxyb29taWQpO1xuICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICByb29taWRcbiAgICB9KVxuICB9LFxuXG5cbiAgY2FuY2xlKCl7XG4gICAgd3gubmF2aWdhdGVCYWNrKHtcbiAgICAgIGNvbXBsZXRlOiAoKSA9PiB7fSxcbiAgICB9KVxuICB9LFxuICBhc3luYyB1cGRhdGVHb29kcyhldmVudDphbnkpe1xuICAgIGxldCB7Z29vZHNpZCxpbmRleCxvblNhbGV9ID0gZXZlbnQuY3VycmVudFRhcmdldC5kYXRhc2V0O1xuICAgIGxldCByb29taWQgPSB0aGlzLmRhdGEucm9vbWlkO1xuICAgIGxldCBbZXJyb3IsIHJlc3VsdF0gPSBhd2FpdCB3eC4kdXRpbHMudG8oXG4gICAgICB3eC4kaHR0cC5yZXF1ZXN0KHtcbiAgICAgICAgdXJsOmAvc2hvcHBpbmcvbGl2ZS91cGRhdGVHb29kc1RvT25TYWxlSW5Sb29tLmRvYCxcbiAgICAgICAgZGF0YTp7XG4gICAgICAgICAgcm9vbWlkLFxuICAgICAgICAgIGdvb2RzaWQsXG4gICAgICAgICAgb25TYWxlXG4gICAgICAgIH1cbiAgICAgIH0pXG4gICAgKVxuICAgIGlmIChlcnJvcil7XG4gICAgICBjb25zb2xlLmxvZyhlcnJvcik7XG4gICAgICByZXR1cm47XG4gICAgfVxuICAgIGNvbnNvbGUubG9nKHJlc3VsdCk7XG4gICAgaWYgKHJlc3VsdC5zdGF0ZT09J3N1Y2Nlc3MnKXtcbiAgICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICAgIFtgZ29vZHNMaXN0WyR7W2luZGV4XX1dYF06cmVzdWx0Lmxpc3RbMF0sXG4gICAgICB9KVxuICAgICAgd3guc2hvd1RvYXN0KHt0aXRsZTogJ+aIkOWKnyd9KTtcbiAgICB9XG4gIH0sXG4gIGFzeW5jIGRlbGV0ZUdvb2RzSW5Sb29tKGV2ZW50OmFueSl7XG4gICAgbGV0IHtnb29kc2lkLGluZGV4fSA9IGV2ZW50LmN1cnJlbnRUYXJnZXQuZGF0YXNldDtcbiAgICBsZXQgcm9vbWlkID0gdGhpcy5kYXRhLnJvb21pZDtcbiAgICB3eC5wcm8uc2hvd01vZGFsKHtcbiAgICAgIHRpdGxlOiAn5o+Q56S6JyxcbiAgICAgIGNvbnRlbnQ6ICfnoa7lrpropoHliKDpmaTor6XllYblk4HlkJfvvJ8nLFxuICAgIH0pLnRoZW4oYXN5bmMgKHJlczphbnkpID0+IHtcbiAgICAgIC8vIG9uIGNsb3NlXG4gICAgICBjb25zb2xlLmxvZyhyZXMpO1xuICAgICAgaWYgKHJlcy5jb25maXJtKXtcbiAgICAgICAgY29uc29sZS5sb2coJ+ehruiupCcpO1xuICAgICAgICBsZXQgW2Vycm9yLCByZXN1bHRdID0gYXdhaXQgd3guJHV0aWxzLnRvKFxuICAgICAgICAgIHd4LiRodHRwLnJlcXVlc3Qoe1xuICAgICAgICAgICAgdXJsOmAvc2hvcHBpbmcvbGl2ZS9kZWxldGVHb29kc0luUm9vbS5kb2AsXG4gICAgICAgICAgICBkYXRhOntcbiAgICAgICAgICAgICAgcm9vbWlkLFxuICAgICAgICAgICAgICBnb29kc2lkXG4gICAgICAgICAgICB9XG4gICAgICAgICAgfSlcbiAgICAgICAgKVxuICAgICAgICBpZiAoZXJyb3Ipe1xuICAgICAgICAgIGNvbnNvbGUubG9nKGVycm9yKTtcbiAgICAgICAgICByZXR1cm47XG4gICAgICAgIH1cbiAgICAgICAgY29uc29sZS5sb2cocmVzdWx0KTtcbiAgICAgICAgaWYgKHJlc3VsdC5zdGF0ZT09J3N1Y2Nlc3MnKXtcbiAgICAgICAgICBsZXQgZ29vZHNMaXN0ID0gdGhpcy5kYXRhLmdvb2RzTGlzdDtcbiAgICAgICAgICBnb29kc0xpc3Quc3BsaWNlKGluZGV4LCAxKTtcbiAgICAgICAgICB0aGlzLnNldERhdGEoe1xuICAgICAgICAgICAgZ29vZHNMaXN0XG4gICAgICAgICAgfSlcbiAgICAgICAgICB3eC5zaG93VG9hc3Qoe3RpdGxlOiAn5oiQ5YqfJ30pO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfSk7XG4gIH0sXG5cblxuICAvKipcbiAgICog55Sf5ZG95ZGo5pyf5Ye95pWwLS3nm5HlkKzpobXpnaLmmL7npLpcbiAgICovXG4gIG9uU2hvdygpIHtcbiAgICB0aGlzLmdldEdvb2RzTGlzdCgpXG4gIH0sXG59KVxuIl19 \ No newline at end of file -- Gitblit v1.8.0