Merge branch 'hotfix/回滚合并' of Software/android-cloud-H5 into master

.env.production

@@ -7,7 +7,7 @@ API_HTTPS = true
 # 文件服务器
 FILE_PREFIX = "/"
 FILE_HOST = "file.phone.androidscloud.com"
-FILE_PORT = 8121
+FILE_PORT = 8210
 FILE_UPLOAD_KEY = "edv834e74a9c43eaac02"
 FILE_HTTPS = true
 

.env.test

@@ -8,7 +8,7 @@ API_HTTPS = false
 # 文件服务器
 FILE_PREFIX = "/"
 FILE_HOST = "file.phone.androidscloud.com"
-FILE_PORT = 8121
+FILE_PORT = 8210
 FILE_UPLOAD_KEY = "3dn9b4585511476691c6"
 FILE_HTTPS = true
 

.env.uat

@@ -8,7 +8,7 @@ API_HTTPS = true
 # 文件服务器
 FILE_PREFIX = "/"
 FILE_HOST = "file.phone.androidscloud.com"
-FILE_PORT = 8121
+FILE_PORT = 8210
 FILE_UPLOAD_KEY = "347905r86eb745a1sc38"
 FILE_HTTPS = true
 

package.json

@@ -48,7 +48,6 @@
     "webpack": "^4.46.0"
   },
   "devDependencies": {
-    "@babel/core": "^7",
     "@babel/eslint-parser": "^7.16.3",
     "@commitlint/cli": "^15.0.0",
     "@commitlint/config-conventional": "^15.0.0",

pages/activity/invite-user/index.vue

@@ -180,7 +180,7 @@ export default {
 
       if (this.$userAgent.isMiniProgram) {
         // 小程序环境
-        await clipboard.writeText(`${url} 唔即云手机`);
+        await clipboard.writeText(url);
         this.$toast.success('链接复制成功');
       } else if (this.$userAgent.isApp) {
         // app环境
@@ -192,7 +192,7 @@ export default {
         });
       } else {
         // 浏览器环境
-        await clipboard.writeText(`${url} 唔即云手机`);
+        await clipboard.writeText(url);
         // throw new Error('1231');
         this.$toast.success('链接复制成功');
       }
@@ -212,7 +212,7 @@ export default {
   color: #333;
   background-image: url('~/assets/image/activity/invite-user/bg@2x.png');
   background-size: 100% auto;
-  // background-position-y: -44px;
+  background-position-y: -44px;
   overflow: hidden;
   padding-bottom: 30px;
 }

pages/activity/invite-user/register.vue

@@ -159,7 +159,7 @@ export default {
   color: #333;
   background-image: url('~/assets/image/activity/invite-user/bg@2x.png');
   background-size: 100% auto;
-  // background-position-y: -44px;
+  background-position-y: -44px;
   overflow: hidden;
   padding-bottom: 30px;
   min-height: 100vh;

pages/index.vue

@@ -3,7 +3,6 @@
     <div>
       <div>
         <v-btn to="/inspire" nuxt>inspire</v-btn>
-        <v-btn to="/phone" nuxt>phoneList</v-btn>
       </div>
     </div>
     <div class="">{{ FILE_PREFIX }}</div>

pages/phone/_id.vue

@@ -1,102 +0,0 @@
-<template>
-  <div class="disk"></div>
-</template>
-
-<script>
-import qs from 'qs';
-export default {
-  middleware: [
-    async ({ base, route, $axios, $auth, redirect, $userAgent }) => {
-      const res = await $axios.$get(
-        '/resources/v5/client/disk/info/userCard/single',
-        {
-          params: {
-            userCardId: route.params.id,
-          },
-        },
-      );
-      const {
-        userCardId,
-        userName,
-        room,
-        buyVipType,
-        sourceType,
-        authPhone,
-        validTime,
-      } = res.data;
-      const token = $auth.strategy.token.get();
-
-      const url = `${location.origin}${base}${
-        $userAgent.isIos ? 'screenIos' : 'screenAndroid'
-      }/WXtrialInterface.html${qs.stringify(
-        {
-          userCardId,
-          username: userName,
-          token,
-          rm: room,
-          mealType: buyVipType,
-          sourceType,
-          authPhone,
-          validTime,
-        },
-        {
-          addQueryPrefix: true,
-        },
-      )}`;
-      // console.log(url);
-      redirect(url);
-      // window.open(url, '_self');
-    },
-  ],
-  data() {
-    return {
-      // diskInfo: null,
-    };
-  },
-  async fetch() {
-    // await this.getDiskInfo(this.$route.params.id);
-    // this.openDisk();
-  },
-  methods: {
-    // async getDiskInfo(userCardId) {
-    //   const res = await this.$axios.$get(
-    //     '/resources/v5/client/disk/info/userCard/single',
-    //     {
-    //       params: {
-    //         userCardId,
-    //       },
-    //     },
-    //   );
-    //   this.diskInfo = res.data;
-    // },
-    // openDisk() {
-    //   const {
-    //     userCardId,
-    //     userName,
-    //     room,
-    //     buyVipType,
-    //     sourceType,
-    //     authPhone,
-    //     validTime,
-    //   } = this.diskInfo;
-    //   const token = this.$auth.strategy.token.get();
-    //   const url = `/screenIos/WXtrialInterface.html${qs.stringify(
-    //     {
-    //       userCardId,
-    //       username: userName,
-    //       token,
-    //       rm: room,
-    //       mealType: buyVipType,
-    //       sourceType,
-    //       authPhone,
-    //       validTime,
-    //     },
-    //     {
-    //       addQueryPrefix: true,
-    //     },
-    //   )}`;
-    //   window.open(url);
-    // },
-  },
-};
-</script>

pages/phone/index.vue

@@ -1,37 +0,0 @@
-<template>
-  <div class="">
-    <div class="disk-list">
-      <div v-for="item in diskList" :key="item.id" class="disk-item">
-        <v-btn
-          :to="{
-            name: 'phone-id',
-            params: {
-              id: item.id,
-            },
-          }"
-          >{{ item.diskName }}</v-btn
-        >
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      diskList: [],
-    };
-  },
-  async fetch() {
-    await this.getDiskList();
-  },
-  methods: {
-    async getDiskList() {
-      const res = await this.$axios.$get('/resources/v5/client/disk/info');
-      this.diskList = res.data.diskInfo;
-    },
-  },
-};
-</script>
-

pages/test/clipboard.vue

@@ -1,45 +0,0 @@
-<template>
-  <div class="">
-    <div v-if="hasClipboard" class="">
-      <div class="">window.navigator.clipboard</div>
-      <v-btn @click="writeText()">写入剪贴板</v-btn>
-      <v-btn @click="readText()">读取剪贴板</v-btn>
-    </div>
-    <div v-else class="">
-      <span>当前环境不支持 window.navigator.clipboard</span>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  auth: false,
-  data() {
-    return {
-      hasClipboard: false,
-    };
-  },
-  mounted() {
-    this.hasClipboard = !!window.navigator.clipboard;
-  },
-  methods: {
-    async writeText() {
-      try {
-        const now = Date.now();
-        await navigator.clipboard.writeText(now);
-        this.$toast.success(`写入成功 ${now}`);
-      } catch (error) {
-        this.$toast.error(`写入失败 ${error.message}`);
-      }
-    },
-    async readText() {
-      try {
-        const clipText = await navigator.clipboard.readText();
-        this.$toast.success(`读取成功 ${clipText}`);
-      } catch (error) {
-        this.$toast.error(`读取失败 ${error.message}`);
-      }
-    },
-  },
-};
-</script>

plugins/auth.js

@@ -1,6 +1,5 @@
 export default async function ({ $auth, query, error }) {
   if (query.token) {
-    console.log("🚀 ~ file: auth.js ~ line 3 ~ query.token", query.token)
     // 请求携带了token
     try {
       await $auth.setUserToken(query.token);

plugins/axios.js

@@ -8,7 +8,6 @@ export default function ({ $axios, $auth, redirect }) {
     return config;
   });
   $axios.onResponse(async (response) => {
-    console.log("🚀 ~ file: axios.js ~ line 11 ~ $axios.onResponse ~ response", response)
     if (Object.prototype.toString.call(response.data) === '[object Object]') {
       if ([6013, 6014].includes(response.data.status)) {
         // await $auth.logout();

plugins/baidu-tongji.js

@@ -6,7 +6,7 @@ export default function (c, i) {
   window._hmt.push(['_setCustomVar', 1, 'MODE', process.env.MODE, 1]);
   app.router.afterEach((to, from) => {
     // 上报PV
-    window._hmt.push(['_trackPageview', c.base + to.path.slice(1)]);
+    window._hmt.push(['_trackPageview', to.fullPath]);
   });
 
   app.head.script = app.head.script || [];

static/microserviceUserH5/static/css/awardActivity.css

@@ -1,755 +0,0 @@
-@media screen and (max-width: 750px) {
-  html {
-    font-size: calc(100vw / 7.5);
-  }
-}
-
-@media screen and (min-width: 750px) {
-  html {
-    font-size: calc(450px / 7.5);
-  }
-}
-
-html, body, div, ul, li, p {
-  padding: 0;
-  margin: 0;
-}
-
-ul, li {
-  list-style: none;
-}
-
-.container{
-  position: relative;
-}
-
-.all-bg-wrap{
-  width: 7.5rem;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: -1;
-}
-
-.all-bg-img{
-  width: 100%;
-}
-
-.rule-wrap{
-  position: absolute;
-  top: 0.6rem;
-  right: 0;
-  width: 0.44rem;
-  height: 1.22rem;
-  line-height: 0.28rem;
-  text-align: center;
-  padding-top: 0.1rem;
-  background: #FFFFFF;
-  opacity: 0.5;
-  border-radius: 0.16rem 0 0 0.16rem;
-  font-size: 0.24rem;
-  font-weight: 600;
-  color: #5C96FF;
-}
-
-.time-position{
-  height: 1.73rem;
-}
-
-.time-wrap{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 4.92rem;
-  height: 0.54rem;
-  margin: 0 auto;
-  border-image: linear-gradient(0deg, #A9CFFD, #97C8FF, #ABEFF2) 10 10;
-  background: linear-gradient(90deg, #8FB5FB 0%, #61AAF9 49%, #59C8DD 100%);
-  border-radius: 0.26rem;
-  font-size: 0.24rem;
-  font-weight: 800;
-  color: #FFFFFF;
-}
-
-
-.top-container{
-  display: flex;
-  justify-content: center;
-  position: relative;
-}
-
-.top-bg-one{
-  width: 7.12rem;
-  height: 8.44rem;
-  margin-top: 0.32rem;
-  display: none;
-}
-
-.top-bg-two{
-  width: 7.12rem;
-  height: 7.34rem;
-  margin-top: 0.32rem;
-}
-
-.get-award-container{
-  position: absolute;
-  top: 1.2rem;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 5.84rem;
-  height: 0.5rem;
-  line-height: 0.5rem;
-  text-align: center;
-  border-radius: 0.3rem;
-  font-size: 0.24rem;
-  font-family: PingFang SC;
-  font-weight: 500;
-  color: #FFF8E5;
-  overflow: hidden;
-}
-
-.award-lists{
-  width: 5.84rem;
-  position: absolute;
-  top: 0;
-  left: 50%;
-  transform: translateX(-50%);
-  height: 6rem;
-}
-
-.award-text{
-  font-size: 0.24rem;
-  color: #ffffff;
-}
-
-.all-award-wrap{
-  width: 6.2rem;
-  position: absolute;
-  top: 2.36rem;
-  left: 50%;
-  transform: translateX(-50%);
-  display: flex;
-  flex-wrap: wrap;
-  margin-left: 0.12rem;
-}
-
-.curr-award-item{
-  width: 1.32rem;
-  height: 1.34rem;
-  background: #FDFCFA;
-  border-radius: 0.08rem;
-  display: flex;
-  flex-direction: column;
-  /* justify-content: center; */
-  align-items: center;
-  padding-top: 0.1rem;
-  margin-left: 0.12rem;
-  margin-bottom: 0.12rem;
-}
-
-.award-img{
-  width: 1.08rem;
-  height: 0.8rem;
-  /* background: #FFE3B7; */
-  border-radius: 0.08rem;
-}
-
-.curr-award-name{
-  margin-top: 0.08rem;
-  padding: 0 0.12rem;
-  font-size: 0.16rem;
-  color: #E4402F;
-  text-align: center;
-}
-
-.curr-award-id{
-  display: none;
-}
-
-.curr-award-item-one{
-  width: 1.78rem;
-  height: 1.72rem;
-  margin-left: 0.16rem;
-}
-
-.curr-award-img-one{
-  width: 1.46rem;
-  height: 1.08rem;
-}
-
-.rest-wrap{
-  width: 7.5rem;
-  /* min-height: 66vh; */
-  margin: 0 auto;
-  margin-top: -0.04rem;
-  padding-bottom: 1.56rem;
-  background-image: url('../img/awardActivity/rest-bg.png');
-  background-repeat: repeat-y;
-  background-size: cover;
-  position: relative;
-}
-
-.award-btn-wrap{
-  width: 5rem;
-  height: 1.58rem;
-  margin: 0 auto;
-  padding-top: 0.34rem;
-}
-
-.start-award{
-  width: 100%;
-  height: 100%;
-}
-
-.get-time-wrap{
-  display: flex;
-  justify-content: space-between;
-  margin: 0 0.56rem;
-  margin-top: 1.2rem;
-}
-
-.rest-time{
-  font-size: 0.28rem;
-  color: #F9F0D4;
-}
-
-.get-time-btn{
-  margin-right: 0.1rem;
-  font-size: 0.32rem;
-  font-weight: 600;
-  color: #DC0622;
-}
-
-.tab-wrap{
-  width: 6.82rem;
-  height: 5.75rem;
-  margin: 0 auto;
-  margin-top: 0.6rem;
-  position: relative;
-}
-
-.tab-bg1{
-  width: 100%;
-  height: 100%;
-}
-
-.tab-bg2{
-  width: 100%;
-  height: 100%;
-  display: none;
-}
-
-.tab-bg3{
-  width: 100%;
-  height: 100%;
-  display: none;
-}
-
-.tab-bg4{
-  width: 100%;
-  height: 100%;
-  display: none;
-}
-
-.no-award-data{
-  width: 3.65rem;
-  height: 1.67rem;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  display: none;
-}
-
-.no-award-img{
-  width: 100%;
-  height: 100%;
-  margin-left: 0.2rem;
-}
-
-.no-award-text{
-  width: 4rem;
-  font-size: 0.28rem;
-  color: #999999;
-}
-
-.no-distribution-data{
-  width: 3.65rem;
-  height: 1.67rem;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  text-align: center;
-  display: none;
-}
-
-.no-distribution-img{
-  width: 1.76rem;
-  height: 1.68rem;
-}
-
-.no-distribution-text{
-  width: 4rem;
-  font-size: 0.28rem;
-  color: #999999;
-}
-
-.award-title-wrap{
-  width: 100%;
-  display: flex;
-  position: absolute;
-  top: 0.3rem;
-  font-size: 0.32rem;
-  font-weight: 500;
-  color: #010101;
-}
-
-.award-title{
-  flex: 1;
-  text-align: center;
-  opacity: 0.5;
-}
-
-.active-title{
-  font-weight: 600;
-  opacity: 1;
-}
-
-.award-list{
-  position: absolute;
-  top: 1.3rem;
-}
-
-.award-list-title-wrap{
-  width: 6.22rem;
-  padding-left: 0.6rem;
-  display: flex;
-  justify-content: space-between;
-  font-size: 0.28rem;
-  color: #333333;
-  border-bottom: 0.02rem solid #F4EDDC;
-  padding-bottom: 0.23rem;
-}
-
-.red{
-  color: #FF482E;
-}
-
-.distribution-total-wrap{
-  width: 100%;
-  padding: 0.46rem 0;
-  font-size: 0.24rem;
-  color: #999999;
-  display: flex;
-  justify-content: center;
-}
-
-.award-total-data:not(:first-child){
-  margin: 0 0.12rem;
-  padding-left: 0.12rem;
-  border-left: 0.01rem solid rgba(135,135,135,1);
-}
-
-.award-list-title, .award-list-content{
-  flex: 1;
-}
-
-.award-list-wrap{
-  margin-top: 0.32rem;
-  height: 3.48rem;
-  overflow-y: scroll;
-}
-
-.distribution-container{
-  height: 5.28rem;
-  overflow-y: scroll;
-}
-
-.award-list-item{
-  width: 6.02rem;
-  padding-left: 0.6rem;
-  display: flex;
-  justify-content: space-between;
-  font-size: 0.28rem;
-  color: #333333;
-  margin-bottom: 0.34rem;
-}
-
-.distribution-list-wrap{
-  width: 100%;
-  position: absolute;
-  top: 1rem;
-  display: none;
-}
-
-.distribution-list{
-  background: rgba(255,255,255,1);
-  margin: 0 0.1rem;
-  padding-bottom: 0.42rem;
-}
-
-.distribution-item{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 0.38rem;
-}
-
-.distribution-main-content{
-  display: flex;
-  align-items: center;
-}
-
-.phone-logo{
-  width: 0.74rem;
-  height: 0.74rem;
-  margin-left: 0.46rem;
-}
-
-.distribution-info{
-  margin-left: 0.14rem;
-}
-
-.distribution-name{
-  font-size: 0.32rem;
-  font-weight: 500;
-  color: #000000;
-}
-
-.distribution-time{
-  margin-top: 0.22rem;
-  font-size: 0.22rem;
-  color: #9E9693;
-}
-
-.change-num-wrap{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  width: 1.84rem;
-  height: 0.56rem;
-  background: #FFFFFF;
-  border: 0.01rem solid #DDDDDD;
-  border-radius: 0.1rem;
-  margin-right: 0.46rem;
-}
-
-.cut, .add{
-  width: 0.56rem;
-  height: 0.56rem;
-  text-align: center;
-  font-size: 0.32rem;
-  color: #999999;
-  position: relative;
-  z-index: 99;
-}
-
-.cut{
-  border-right: 0.01rem solid #DDDDDD;
-}
-
-.add{
-  border-left: 0.01rem solid #DDDDDD;
-}
-
-.num-ipt{
-  width: 0.36rem;
-  height: 0.38rem;
-  margin: 0 0.1rem;
-  border-radius: 0.04rem;
-  text-align: center;
-  border: none;
-}
-
-input:focus{ 
-  outline:none; 
-}
-
-.distribution-award-btn{
-  width: 5.7rem;
-  height: 0.88rem;
-  line-height: 0.88rem;
-  margin: 0 auto;
-  text-align: center;
-  background: linear-gradient(90deg, #FFDD71 0%, #FEC047 100%);
-  border-radius: 0.44rem;
-  font-size: 0.36rem;
-  font-weight: bold;
-  color: #DC0622;
-}
-
-.award-record-list{
-  min-height: 5.6rem;
-  padding: 0 0.56rem;
-  margin: 0 0.1rem;
-  margin-top: 0.24rem;
-  background: rgba(255,255,255,1);
-  border-radius: 0.16rem;
-  display: none;
-}
-
-.record-list-title{
-  width: 3.71rem;
-  height: 0.72rem;
-  line-height: 0.72rem;
-  text-align: center;
-  margin: 0 auto;
-  background: #FEDFB3;
-  border-radius: 0 0 0.24rem 0.24rem;
-  font-size: 0.32rem;
-  font-weight: 500;
-  color: #7D271A;
-}
-
-.award-record-list-title-wrap{
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-  font-size: 0.32rem;
-  font-weight: 500;
-  color: #010101;
-  opacity: 0.5;
-  margin-top: 0.3rem;
-}
-
-.award-record-list-wrap{
-  margin-top: 0.3rem;
-  height: 3.48rem;
-  overflow-y: scroll;
-}
-
-.award-record-list-item{
-  display: flex;
-  font-size: 0.28rem;
-  color: #666666;
-  padding-bottom: 0.4rem;
-}
-
-.award-record-list-name{
-  min-width: 1.5rem;
-}
-
-.award-record-list-day{
-  min-width: 0.6rem;
-  text-align: right;
-}
-
-.result-mask,.rule-mask{
-  width: 100%;
-  height: 100vh;
-  position: fixed;
-  z-index: 9999;
-  top: 0;
-  left: 0;
-  background: rgba(0, 0, 0, 0.5);
-  display: none;
-}
-
-.result-dialog,.rule-result-dialog{
-  width: 5.86rem;
-  height: 6.49rem;
-  background: linear-gradient(0deg, #FFFFFF 74%, #FFEDEE 100%);
-  border-radius: 0.32rem;
-  position: absolute;
-  left: 50%;
-  top: -10.86rem;
-  transform: translateX(-50%);
-}
-
-.rule-title-wrap{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.rule-title-icon{
-  width: 0.56rem;
-  height: 0.08rem;
-  background: linear-gradient(90deg, #FFE2E0 0%, #FFF4F4 100%);
-}
-
-.rule-title{
-  margin: 0 0.2rem;
-  text-align: center;
-  font-size: 0.36rem;
-  font-weight: bold;
-  color: #333333;
-}
-
-.rule-content{
-  width: 5.86rem;
-  padding: 0.2rem 0;
-  border-radius: 0.1rem;
-  position: absolute;
-  top: 0.2rem;
-}
-
-.rule-point-wrap{
-  height: 4.9rem;
-  margin: 0 0.4rem;
-  margin-top: 0.34rem;
-  font-size: 0.28rem;
-  line-height: 0.4rem;
-  overflow-y: scroll;
-}
-
-.rule-point{
-  margin: 0 0.3rem;
-  font-size: 0.24rem;
-  line-height: 0.48rem;
-}
-
-.card-close,.rule-close{
-  width: 0.68rem;
-  height: 0.68rem;
-  position: absolute;
-  left: 50%;
-  bottom: -1rem;
-  transform: translateX(-50%);
-}
-
-.sure-distribution-wrap{
-  width: 100vw;
-  height: 100vh;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background-color: rgba(0, 0, 0, 0.24);
-  z-index: 999;
-  display: none;
-}
-.sure-distribution-box{
-  width: 6.22rem;
-  height: 2.28rem;
-  background: #FFFFFF;
-  border-radius: 0.2rem;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%,-50%);
-}
-.sure-distribution-title{
-  text-align: center;
-  padding: 0.48rem;
-  font-size: 0.32rem;
-        color: #333333;
-}
-.sure-distribution-btn-list{
-  width: 100%;
-  height: 0.86rem;
-  display: flex;
-  justify-content: space-between;
-  border-top: 0.01rem solid #E5E5E5;
-  font-size: 0.28rem;
-}
-.sure-distribution-btn{
-  height: 0.86rem;
-  line-height: 0.86rem;
-  text-align: center;
-  flex: 1;
-}
-.sure-distribution-sure{
-  border-left: 0.01rem solid #b4bbc5;
-  color: #3B7FFF;
-}
-.sure-distribution-cannel:active{
-  background-color: #E5E5E5;
-  border-bottom-left-radius: 0.2rem;
-}
-.sure-distribution-sure:active{
-  background-color: #E5E5E5;
-  border-bottom-right-radius: 0.2rem;
-}
-
-.result-title-wrap{
-  margin-top: 0.5rem;
-}
-
-.main-contain{
-  margin-top: 0.48rem;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-
-.card-img{
-  width: 1.52rem;
-  height: 1.52rem;
-  /* background: #FFF0DB; */
-  border-radius: 0.24rem;
-}
-
-.card-img1{
-  width: 1.46rem;
-  height: 1.08rem;
-}
-
-.card-img2{
-  width: 1.08rem;
-  height: 0.8rem;
-}
-
-.card-title{
-  margin-top: 0.24rem;
-  font-size: 0.32rem;
-  color: #333333;
-}
-
-.card-tips{
-  margin-top: 0.14rem;
-  font-size: 0.24rem;
-  color: #888888;
-}
-
-.card-btn{
-  width: 4rem;
-  height: 0.96rem;
-  line-height: 0.96rem;
-  text-align: center;
-  margin-top: 0.56rem;
-  background: linear-gradient(90deg, #FF0200 0%, #FF7900 100%);
-  border-radius: 0.48rem;
-  font-size: 0.32rem;
-  color: #FFFFFF;
-}
-
-.card-rest-times{
-  margin-top: 0.26rem;
-  font-size: 0.24rem;
-  color: #B5B5B5;
-}
-
-#toast-container>.toast-error {
-  background-image: none !important;
-}
-
-.toast-error {
-  background-color: rgba(0, 0, 0, 0.8);
-}
-
-#toast-container>div {
-  font-size: 14px;
-  min-width: 80px !important;
-  padding: 12px !important;
-  box-shadow: none;
-}
-
-.toast-center-center {
-  position: fixed;
-  min-width: 220px;
-  top: 50%;
-  left: 50%;
-  text-align: center;
-  transform: translateX(-50%);
-  color: #FFFFFF;
-  border-radius: 0.1rem;
-}
-
-@media (max-width: 480px) and (min-width: 241px) {
-  #toast-container>div {
-    min-width: 80px !important;
-    width: auto;
-  }
-}

static/microserviceUserH5/static/js/vender/config.js

@@ -5,6 +5,7 @@ var baseUrl = url[0] + '//' + url[2];
 // var baseUrl = 'http://prese.phone.androidscloud.com'
 // var baseUrl = 'http://vclusters.imwork.net:2221'
 
+
 function GetRequest() {
   var url = location.search; // 获取url中"?"符后的字串
   var obj= new Object();

static/microserviceUserH5/vcloud/iosEnter.html

@@ -18,13 +18,12 @@
 	</script>
 </head>
 <div class="container">
-	<div class="index-icon" id="index-phone">
-		<img class="img" src="../static/img/iosEnter/index-phone.png" />
-		<img class="entry" src="../static/img/iosEnter/entry.png" />
-	</div>
 	<div class="index-icon" id="index-what">
 		<img class="img" src="../static/img/iosEnter/index-what.png" />
 	</div>
+	<div class="index-icon" id="index-phone">
+		<img class="img" src="../static/img/iosEnter/index-phone.png" />
+	</div>
 </div>
 <script type="text/javascript" th:inline="javascript">
 	let node = document.getElementById('index-what');
@@ -92,8 +91,7 @@
 	.index-icon{
 		width: 6.5rem;
 		height: 2.28rem;
-		margin-top: 0.36rem;
-		position: relative;
+		padding-top: 0.36rem;
 	}
 	.img{
 		width: 100%;
@@ -102,13 +100,6 @@
 	#index-phone{
 		display: none;
 	}
-	.entry{
-		width: 2.08rem;
-		height: 1.28rem;
-		position: absolute;
-		top: 0.32rem;
-		right: 0.4rem;
-	}
 	#toast-container>.toast-error {
 		background-image: none !important;
 	}

static/screenAndroid/WXdraw.js

@@ -1,5 +1,5 @@
 //蒙版
-var canvas_bak = document.getElementById('box');
+var canvas_bak = document.getElementById("box");
 
 var winHeight = window.screen.height - window.innerHeight;
 var vowidth = window.screen.width;
@@ -8,9 +8,9 @@ var numse = window.screen.height;
 
 // 计算title top 头部 连接断开，是否准备重连？
 if (numse <= 70) {
-  var voheight = window.screen.height - winHeight - 34 - 20;
+  var voheight = window.screen.height - winHeight - 34 - 20
 } else {
-  var voheight = window.screen.height - topwinHeightDraw - 20;
+  var voheight = window.screen.height - topwinHeightDraw - 20
 }
 
 // 画笔大小
@@ -24,8 +24,7 @@ var videoWidth, videoHeight;
 var isControl = true; // 是否是观看模式
 var isAuth = parameters['authPhone']; // 是否是获取的云手机
 
-var wsss,
-  errorTime = 0;
+var wsss, errorTime = 0;
 var first = true;
 function throttle(fn, delay) {
   var flag = true;
@@ -41,26 +40,21 @@ function throttle(fn, delay) {
 }
 
 function doConnectDirectives() {
-  videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720;
-  videoHeight = videoWidth === 720 ? 1280 : 1920;
+  videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
+  videoHeight = videoWidth === 720 ? 1280 : 1920
   wsss = new WebSocket(cUrl);
   wsss.binaryType = 'arraybuffer';
 
   wsss.onopen = function () {
     // 进入发起询问
     var pings2 = {
-      type: 'forwardMsg',
-      data: {
-        code: '3000',
-        desc: '询问是否有在控制', // 可选
-      },
-    };
+      "type": "forwardMsg",
+      "data": {
+        "code": "3000",
+        "desc": "询问是否有在控制" // 可选
+      }
+    }
     wsss.send(JSON.stringify(pings2));
-    wsss.send(
-      JSON.stringify({
-        type: 'getPhoneSize',
-      }),
-    );
   };
   wsss.onerror = function (evt) {
     wsss.close();
@@ -70,67 +64,47 @@ function doConnectDirectives() {
     }
   };
   wsss.onmessage = function (res) {
-    console.log('res', res);
-    var result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
-    console.log('result.type', result.type);
+    console.log('res', res)
+    var result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
+    console.log('result.type', result.type)
     if (result.type === 'cutting') {
       if (result.data.status === 0) {
-        $.toast('复制成功', 'text');
+        $.toast('复制成功', "text");
       } else {
-        $.toast(result.msg, 'text');
+        $.toast(result.msg, "text");
       }
-      return;
+      return
     }
-    if (result.type === 'forwardMsg') {
-      if (isAuth !== 'none') {
-        if (result.data.code === 4000 || result.data.code === 3000) {
-          if (isAuth === 'huo') {
-            $.confirm(
-              '授权方已收回控制权，您进入观看屏幕模式',
-              function () {
-                //点击确认后的回调函数
-                isControl = false;
-              },
-              function () {
-                isControl = false;
-                //点击取消后的回调函数
-                quit();
-              },
-            );
-          } else {
-            $.confirm(
-              '当前云手机正在授控，是否请求获取云手机控制权？',
-              function () {
-                //点击确认后的回调函数
-                var ping = {
-                  type: 'forwardMsg',
-                  data: {
-                    code: '5000',
-                    desc: '控制权限收回', // 可选
-                  },
-                };
-                wsss.send(JSON.stringify(ping));
-                isControl = true;
-              },
-              function () {
-                //点击取消后的回调函数
-                isControl = false;
-              },
-            );
-          }
-          return;
-        }
-        if (result.data.code === 'phoneSizeChange') {
-          console.log(result.data);
-          window.currentPhoneSize = {
-            width: result.data.width,
-            height: result.data.height,
-          };
-          return;
+    if (result.type === 'forwardMsg' && isAuth !== 'none') {
+      if (result.data.code === 4000 || result.data.code === 3000) {
+        if (isAuth === 'huo') {
+          $.confirm("授权方已收回控制权，您进入观看屏幕模式", function () {
+            //点击确认后的回调函数
+            isControl = false;
+          }, function () {
+            isControl = false;
+            //点击取消后的回调函数
+            quit();
+          });
+        } else {
+          $.confirm("当前云手机正在授控，是否请求获取云手机控制权？", function () {
+            //点击确认后的回调函数
+            var ping = {
+              "type": "forwardMsg",
+              "data": {
+                "code": "5000",
+                "desc": "控制权限收回" // 可选
+              }
+            }
+            wsss.send(JSON.stringify(ping));
+            isControl = true;
+          }, function () {
+            //点击取消后的回调函数
+            isControl = false;
+          });
         }
-        return;
       }
-      return;
+      return
     }
     if (result.type === 'payInitiateEvent') {
       var url = window.location.href;
@@ -147,128 +121,93 @@ function doConnectDirectives() {
         dataType: 'json',
         contentType: 'application/json;charset=UTF-8',
         success: function (res) {
-          if (result.data.payType === 1) {
-            // 微信
-            if (window.__wxjs_environment === 'miniprogram') {
-              // 小程序
+          if(result.data.payType === 1) { // 微信
+            if (window.__wxjs_environment === 'miniprogram') { // 小程序
               // copyUrl(result.data.payUrl);
             } else {
-              window.location.href = result.data.payUrl;
+              window.location.href = result.data.payUrl
             }
           } else {
-            window.location.href = result.data.payUrl;
+            window.location.href = result.data.payUrl
           }
         },
       });
-      return;
-    }
-    if (result.type === 'getPhoneSize') {
-      // console.log(result);
-      const data = window.phoneSizeList.find(function (v) {
-        return v.width === result.data.width && v.height === result.data.height;
-      });
-      window.currentPhoneSize = data || {
-        width: result.data.width,
-        height: result.data.height,
-      };
-      return;
+      return
     }
-  };
+  }
 }
-$('body').on('click', function () {
+$('body').on("click", function () {
   draw_graph('pencil');
-});
+})
 //剪切板
-$('.upload').on('click', function () {
-  var texts = $(this).attr('data-text');
-  if (texts == 'uploads') {
-    $('.mainbox').css({
-      display: 'block',
-    });
-    $('.sbox').css({
-      display: 'none',
-    });
+$(".upload").on("click", function () {
+  var texts = $(this).attr("data-text")
+  if (texts == "uploads") {
+    $(".mainbox").css({
+      "display": "block"
+    })
+    $(".sbox").css({
+      "display": "none"
+    })
   }
-});
+})
 
 //home 控制home
-$('.botmat1img').on('click', function () {
-  var codes = $(this).attr('data-text');
-  if (codes == 'home' && isControl) {
+$(".botmat1img").on("click", function () {
+  var codes = $(this).attr("data-text")
+  if (codes == "home" && isControl) {
     wsss.send(ExexuteKeyBoard(3));
-  } else if (codes == 'return' && isControl) {
+  } else if (codes == "return" && isControl) {
     wsss.send(ExexuteKeyBoard(4));
-  } else if (codes == 'gengduo' && isControl) {
+  } else if (codes == "gengduo" && isControl) {
     wsss.send(ExexuteKeyBoard(187));
   }
-});
+
+})
 // 高清控制
-$('.PictureQuality').on('click', function () {
+$(".PictureQuality").on("click", function () {
   if (!isControl) {
-    return;
+    return
   }
-  $(this).addClass('avit').siblings().removeClass('avit');
-  var id = $(this).attr('data-id');
+  $(this).addClass("avit").siblings().removeClass('avit')
+  var id = $(this).attr("data-id")
   var buffer = makeSharpness(Number(id));
   ws.send(buffer);
-});
+})
 //画图形
 var draw_graph = function (graphType, obj) {
   //把蒙版放于画板上面
-  $('#container').css('z-index', 30);
-  $('#dedit').css('z-index', 20);
+  $("#container").css("z-index", 30);
+  $("#dedit").css("z-index", 20);
   var canDraw = false;
   //鼠标按下获取 开始xy开始画图
   var ongoingTouches = [];
   var touchstart = function (e) {
     if (!isControl) {
-      return;
+      return
     }
     $('.control-right-img').attr({
-      'data-id': '2',
-    });
-    $('.leftmains').css({
-      right: '-4rem',
-    });
+      "data-id": "2"
+    })
+    $(".leftmains").css({
+      "right": "-4rem"
+    })
     var touchfor = e.originalEvent.changedTouches; //for 的手指数组
     //是否横屏
     for (var i = 0; i < touchfor.length; i++) {
-      // var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
-      // var acrossHeightY =
-      //   videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
-      var verticalWidthX =
-        touchfor[i].pageX * (window.currentPhoneSize.width / vowidth);
-      var verticalHeightY =
-        touchfor[i].pageY * (window.currentPhoneSize.width / voheight);
+      var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
+      var acrossHeightY = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalWidthX = touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalHeightY = touchfor[i].pageY * (videoHeight / voheight);
       var idx = ongoingTouches.findIndex(function (ele) {
-        return ele.identifier === touchfor[i].identifier;
-      });
+        return ele.identifier === touchfor[i].identifier
+      })
       if (idx < 0) {
         ongoingTouches.push(touchfor[i]);
       }
-      var ping =
-        // resolving == 0
-        //   ? {
-        //       data: {
-        //         action: 0,
-        //         count: ongoingTouches.length,
-        //         pointerId: touchfor[i].identifier,
-        //         x: acrossWidthX.toFixed(2),
-        //         y: acrossHeightY.toFixed(2),
-        //       },
-        //       type: 'event',
-        //     }
-        //   :
-        {
-          data: {
-            action: 0,
-            count: ongoingTouches.length,
-            pointerId: touchfor[i].identifier,
-            x: verticalWidthX.toFixed(2),
-            y: verticalHeightY.toFixed(2),
-          },
-          type: 'event',
-        };
+      var ping = resolving == 0 ?
+        { "data": { "action": 0, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
+        { "data": { "action": 0, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": verticalWidthX.toFixed(2), "y": verticalHeightY.toFixed(2) }, "type": "event" };
       wsss.send(JSON.stringify(ping));
     }
     canDraw = true;
@@ -277,47 +216,24 @@ var draw_graph = function (graphType, obj) {
   //鼠标离开 把蒙版canvas的图片生成到canvas中
   var touchend = function (e) {
     if (!isControl) {
-      return;
+      return
     }
     var touchfor = e.originalEvent.changedTouches; //for 的手指数组
     //是否横屏
     for (var i = 0; i < touchfor.length; i++) {
-      // var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
-      // var acrossHeightY =
-      //   videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
-      var verticalWidthX =
-        touchfor[i].pageX * (window.currentPhoneSize.width / vowidth);
-      var verticalHeightY =
-        touchfor[i].pageY * (window.currentPhoneSize.height / voheight);
-      var ping =
-        // resolving == 0
-        //   ? {
-        //       data: {
-        //         action: 1,
-        //         count: ongoingTouches.length,
-        //         pointerId: touchfor[i].identifier,
-        //         x: acrossWidthX.toFixed(2),
-        //         y: acrossHeightY.toFixed(2),
-        //       },
-        //       type: 'event',
-        //     }
-        //   :
-        {
-          data: {
-            action: 1,
-            count: ongoingTouches.length,
-            pointerId: touchfor[i].identifier,
-            x: verticalWidthX.toFixed(2),
-            y: verticalHeightY.toFixed(2),
-          },
-          type: 'event',
-        };
+      var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
+      var acrossHeightY = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalWidthX = touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalHeightY = touchfor[i].pageY * (videoHeight / voheight);
+      var ping = resolving == 0 ?
+        { "data": { "action": 1, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
+        { "data": { "action": 1, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": verticalWidthX.toFixed(2), "y": verticalHeightY.toFixed(2) }, "type": "event" };
       wsss.send(JSON.stringify(ping));
       ongoingTouches.forEach(function (item, index) {
         if (item.identifier === touchfor[i].identifier) {
-          ongoingTouches.splice(index, 1);
+          ongoingTouches.splice(index, 1)
         }
-      });
+      })
     }
     canDraw = false;
   };
@@ -325,45 +241,22 @@ var draw_graph = function (graphType, obj) {
   //清空层 云手机超出屏幕的开关
   var clearContext = function () {
     canDraw = false;
-  };
+  }
 
   // 鼠标移动
   var touchmove = function (e) {
     if (!isControl) {
-      return;
+      return
     }
     var touchfor = e.originalEvent.targetTouches; //for 的手指数组
     for (var i = 0; i < touchfor.length; i++) {
-      // var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
-      // var acrossHeightY =
-      //   videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
-      var verticalWidthX =
-        touchfor[i].pageX * (window.currentPhoneSize.width / vowidth);
-      var verticalHeightY =
-        touchfor[i].pageY * (window.currentPhoneSize.height / voheight);
-      var ping =
-        // resolving == 0
-        //   ? {
-        //       data: {
-        //         action: 2,
-        //         count: touchfor.length,
-        //         pointerId: touchfor[i].identifier,
-        //         x: acrossWidthX.toFixed(2),
-        //         y: acrossHeightY.toFixed(2),
-        //       },
-        //       type: 'event',
-        //     }
-        //   :
-        {
-          data: {
-            action: 2,
-            count: touchfor.length,
-            pointerId: touchfor[i].identifier,
-            x: verticalWidthX.toFixed(2),
-            y: verticalHeightY.toFixed(2),
-          },
-          type: 'event',
-        };
+      var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
+      var acrossHeightY = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalWidthX = touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalHeightY = touchfor[i].pageY * (videoHeight / voheight);
+      var ping = resolving == 0 ?
+        { "data": { "action": 2, "count": touchfor.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
+        { "data": { "action": 2, "count": touchfor.length, "pointerId": touchfor[i].identifier, "x": verticalWidthX.toFixed(2), "y": verticalHeightY.toFixed(2) }, "type": "event" };
       wsss.send(JSON.stringify(ping));
     }
   };
@@ -373,24 +266,24 @@ var draw_graph = function (graphType, obj) {
     if (graphType != 'handwriting') {
       clearContext();
     }
-  };
+  }
 
   $(canvas_bak).unbind();
   $(canvas_bak).bind('touchstart', touchstart);
   $(canvas_bak).bind('touchmove', touchmove);
   $(canvas_bak).bind('touchend', touchend);
   $(canvas_bak).bind('mouseout', mouseout);
-};
+}
 
 // 获取url中"?"符后的字串
 function GetRequest() {
   var url = location.search;
   var obj = new Object();
-  if (url.indexOf('?') != -1) {
+  if (url.indexOf("?") != -1) {
     var str = url.substr(1);
-    strs = str.split('&');
+    strs = str.split("&");
     for (var i = 0; i < strs.length; i++) {
-      obj[strs[i].split('=')[0]] = strs[i].split('=')[1];
+      obj[strs[i].split("=")[0]] = (strs[i].split("=")[1]);
     }
   }
   return obj;

static/screenAndroid/WXtrialInterface.html

@@ -42,22 +42,9 @@
       rel="stylesheet"
       href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css"
     />
-    <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
   </head>
 
   <body class="scroll h-player" style="overscroll-behavior: contain">
-    <template id="template-phone-size-item">
-      {{~ it.list :value:index }}
-      <div
-        class="phone-size-item {{? value.width === it.active.width && value.height === it.active.height }}active{{?}}"
-        data-width="{{= value.width }}"
-        data-height="{{= value.height }}"
-        data-id="{{= value.id }}"
-      >
-        <span>{{= value.width }}x{{= value.height }}</span>
-      </div>
-      {{~}}
-    </template>
     <div class="container" id="player">
       <div class="muted" id="btnMuted">
         <div class="control-right-img" data-id="1">
@@ -93,14 +80,9 @@
       </div>
       <div class="leftmains">
         <div class="PictureQualityMain">
-          <div class="menu-btn PictureQuality" data-id="4">高清</div>
-          <div class="menu-btn PictureQuality avit" data-id="3">标清</div>
-          <div class="menu-btn PictureQuality" data-id="2">极速</div>
-        </div>
-        <div class="">
-          <div class="menu-btn" id="open-set-phone-size-dialog-btn">
-            <span>分辨率</span>
-          </div>
+          <div class="PictureQuality" data-id="4">高清</div>
+          <div class="PictureQuality avit" data-id="3">标清</div>
+          <div class="PictureQuality" data-id="2">极速</div>
         </div>
         <div class="operation">
           <div class="upload" id="showsuss" data-text="uploads">
@@ -190,26 +172,7 @@
       </div>
     </div>
 
-    <!-- <body oncontextmenu="Back()"></body> -->
-    <div id="set-phone-size-dialog" class="dialog">
-      <div class="dialog-mask"></div>
-      <!-- 设置分辨率的弹窗 -->
-      <div class="dialog-content-border">
-        <div class="dialog-content">
-          <div class="dialog-header">
-            <div class="dialog-btn cancel">
-              <span>取消</span>
-            </div>
-            <div class="dialog-btn confirm">
-              <span>确定</span>
-            </div>
-          </div>
-          <div class="dialog-main">
-            <div id="phone-size-list"></div>
-          </div>
-        </div>
-      </div>
-    </div>
+    <body oncontextmenu="Back()"></body>
     <script
       type="text/javascript"
       src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"
@@ -254,10 +217,10 @@
         /^192\.168\./.test(location.host) ||
         /^127\.0\.0\.1/.test(location.host) ||
         /^localhost/.test(location.host);
-      // if (isDev) {
-      //   baseUrl = 'http://gntest.phone.androidscloud.com:1280';
-      //   sourceType = 2;
-      // }
+      if (isDev) {
+        baseUrl = 'http://gntest.phone.androidscloud.com:1280';
+        sourceType = 2;
+      }
       if (parameters['mealType'] === 'VIP') {
         $('.loading_sceen_pic').attr('src', '../static/img/home_bg_VIP.png');
       } else if (parameters['mealType'] === 'SVIP') {
@@ -413,7 +376,6 @@
       Module.onRuntimeInitialized = function () {
         isFinish = true;
       };
-      var timerInterval = null, timeInterval = 0;
       function connect(type) {
         $.ajax({
           url: baseUrl + '/api/resources/user/cloud/connect',
@@ -429,9 +391,6 @@
           async: false,
           success: function (res) {
             if (res.status === 0) {
-              if (timerInterval) {
-                timerInterval = clearTimeout();
-              }
               if (res.data.internetHttps) {
                 socketURL =
                   'wss://' +
@@ -472,31 +431,13 @@
                 }
               } else {
                 $.toast('网络异常，请稍后重试', 'text');
-                setTimeout(() => {
-                  clearInterval(intervaler);
-                  quit();
-                }, 3000);
               }
-            } else if (res.status === 5200) {
-              if (timeInterval > 7) {
-                $.toast('网络异常，请稍后重试', 'text');
-                setTimeout(() => {
-                  clearInterval(intervaler);
-                  quit();
-                }, 3000);
-                timerInterval = clearTimeout()
-                return
-              }
-              timerInterval = setTimeout(() => {
-                connect(type);
-                timeInterval += 1;
-              }, 3000)
             } else {
               $.toast('画面异常,请重新进入', 'text');
-              setTimeout(() => {
-                clearInterval(intervaler);
-                quit();
-              }, 3000);
+              clearInterval(intervaler);
+              quit();
+              ws.close();
+              wsss.close();
             }
           },
         });
@@ -542,11 +483,9 @@
           if (ws.readyState === 1) {
             ws.send('ping');
           } else {
+            clearInterval(intervaler);
             $.toast('画面异常,请重新进入', 'text');
-            setTimeout(() => {
-              clearInterval(intervaler);
-              quit();
-            }, 3000)
+            quit();
           }
         }, 3000);
 
@@ -563,10 +502,8 @@
           throttle(doConnectBusiness, 100);
           if (errorTime > 1000) {
             $.toast('画面异常,请重新进入', 'text');
-            setTimeout(() => {
-              wsss.close();
-              quit();
-            }, 3000)
+            wsss.close();
+            quit();
           }
         });
         ws.addEventListener('message', function (event) {
@@ -655,7 +592,7 @@
               ws.close();
               wsss.close();
               uni.webView.navigateBack({
-                delta: 1,
+                delta: 1
               });
             }
           }
@@ -809,75 +746,46 @@
           return;
         }
         stopManyClick(() => {
-          new Promise((resolve, reject) => {
-            if (window.navigator.clipboard) {
-              window.navigator.clipboard
-                .readText()
-                .then(
-                  function (content) {
-                    return $.ajax({
-                      url: baseUrl + '/api/public/v5/shear/content',
-                      type: 'post',
-                      dataType: 'json',
-                      data: JSON.stringify({
-                        content: content,
-                      }),
-                      headers: {
-                        'content-Type': 'application/json',
-                        Authorization: token,
-                      },
-                    });
-                  },
-                  function (err) {
-                    $.toast('读取剪贴板失败', 'text');
-                  },
-                )
-                .finally(resolve);
-            } else {
-              resolve();
-            }
-          }).then(function () {
-            $('.box-shear-plate').empty();
-            $.ajax({
-              url: baseUrl + '/api/public/v5/shear/content',
-              headers: {
-                Authorization: token,
-              },
-              type: 'get',
-              dataType: 'json',
-              success: function (res) {
-                if (res.status === 0) {
-                  if (res.data.length) {
-                    cutList = array_unique(res.data);
-                    var str =
-                      '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
-                    cutList.forEach(function (item) {
-                      str +=
-                        "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
-                        item.content +
-                        '")\'>' +
-                        item.content +
-                        "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
-                        item.id +
-                        ")'>删除</button></div></div></div>";
-                    });
-                    str += '</div>';
-                    $('.box-shear-plate').append(str);
-                  } else {
-                    $('.box-shear-plate').append(
-                      '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
-                    );
-                  }
-                  $('.mask').show();
-                  initSlider();
+          $('.box-shear-plate').empty();
+          $.ajax({
+            url: baseUrl + '/api/public/v5/shear/content',
+            headers: {
+              Authorization: token,
+            },
+            type: 'get',
+            dataType: 'json',
+            success: function (res) {
+              if (res.status === 0) {
+                if (res.data.length) {
+                  cutList = array_unique(res.data);
+                  var str =
+                    '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
+                  cutList.forEach(function (item) {
+                    str +=
+                      "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
+                      item.content +
+                      '")\'>' +
+                      item.content +
+                      "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
+                      item.id +
+                      ")'>删除</button></div></div></div>";
+                  });
+                  str += '</div>';
+                  $('.box-shear-plate').append(str);
                 } else {
                   $('.box-shear-plate').append(
                     '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
                   );
-                  $('.mask').show();
                 }
-              },
-            });
+                $('.mask').show();
+                initSlider();
+              } else {
+                $('.box-shear-plate').append(
+                  '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
+                );
+                $('.mask').show();
+              }
+            },
           });
         });
       }
@@ -1489,12 +1397,9 @@
       // 观看广告次数上报
       function reportFrequency() {
         $.ajax({
-          url:
-            baseUrl +
-            '/api/resoures/v1/trial/reportFrequency/' +
-            form.userCardId,
+          url: baseUrl + '/api/resoures/v1/trial/reportFrequency/' + form.userCardId,
           headers: {
-            Authorization: form.token,
+            Authorization: form.token
           },
           type: 'post',
           contentType: 'application/json',
@@ -1504,8 +1409,8 @@
       }
       //关闭广告
       $('.time-close-wrap')[0].addEventListener('click', () => {
-        if (videoTime == 0) {
-          reportFrequency();
+        if(videoTime == 0) {
+          reportFrequency()
         }
         $('.buy-phone-wrap').eq(0).show();
       });
@@ -1613,7 +1518,7 @@
           });
         } else {
           uni.webView.navigateBack({
-            delta: 1,
+	          delta: 1
           });
         }
       }
@@ -1621,137 +1526,6 @@
         ws.close();
         wsss.close();
       };
-      function updatePhoneSizeListHtml() {
-        const templatePhoneSizeItem = doT.template(
-          $('#template-phone-size-item').html().replace(/&amp;/g, '&'),
-        );
-        const phoneSizeListItemsHtml = templatePhoneSizeItem({
-          list: window.phoneSizeList,
-          active: window.activePhoneSize,
-        });
-        $('#phone-size-list').html(phoneSizeListItemsHtml);
-      }
-      $('#open-set-phone-size-dialog-btn').on('click', function (e) {
-        window.activePhoneSize = window.currentPhoneSize;
-        updatePhoneSizeListHtml();
-        $('#set-phone-size-dialog').addClass('show');
-      });
-      // $('#set-phone-size-dialog').addClass('show');
-      $('.dialog .dialog-mask')
-        .add('.dialog .dialog-btn.cancel')
-        .on('click', function (e) {
-          $(e.currentTarget).parents('.dialog').removeClass('show');
-        });
-
-      // 分辨率列表
-      window.phoneSizeList = [];
-      // 当前生效的分辨率
-      window.currentPhoneSize = {
-        width: 720,
-        height: 1280,
-      };
-      // 选中的分辨率
-      window.activePhoneSize = window.currentPhoneSize;
-
-      function getPhoneSizeList() {
-        return $.ajax({
-          url:
-            baseUrl + '/api/resources/v5/machine/resolution/getResolvingPower',
-          headers: {
-            Authorization: token,
-          },
-          type: 'get',
-          dataType: 'json',
-          data: {
-            userCardId,
-          },
-        }).then(function (response) {
-          return response.data.map(function (v) {
-            return {
-              id: v.id,
-              dpi: v.dpi,
-              width: v.width || v.abscissa,
-              height: v.height || v.ordinate || v.high,
-            };
-          });
-        });
-      }
-
-      getPhoneSizeList().then(function (phoneSizeList) {
-        window.phoneSizeList = phoneSizeList;
-        const currentPhoneSize = window.phoneSizeList.find(function (v) {
-          return (
-            v.width === window.currentPhoneSize.width &&
-            v.height === window.currentPhoneSize.height
-          );
-        });
-        window.currentPhoneSize = currentPhoneSize || window.currentPhoneSize;
-        return updatePhoneSizeListHtml();
-      });
-
-      // const phoneSizeListSwiper = new Swiper('#phone-size-list-swiper', {
-      //   direction: 'vertical',
-      //   slidesPerView: 'auto',
-      //   loop: false,
-      //   centeredSlides: true,
-      // });
-      function setPhoneSize(config) {
-        wsss.send(
-          JSON.stringify({
-            type: 'setPhoneSize',
-            data: {
-              width: config.width,
-              height: config.height,
-            },
-          }),
-        );
-        wsss.send(
-          JSON.stringify({
-            type: 'forwardMsg',
-            data: {
-              code: 'phoneSizeChange',
-              id: config.id,
-              width: config.width,
-              height: config.height,
-              desc: '分辨率修改', // 可选
-            },
-          }),
-        );
-        $.ajax({
-          url:
-            baseUrl +
-            '/api/resources/v5/machine/resolution/operationResolvingPower',
-          headers: {
-            Authorization: token,
-          },
-          type: 'post',
-          dataType: 'json',
-          contentType: 'application/json; charset=UTF-8',
-          data: JSON.stringify({
-            userCardId: window.userCardId,
-            width: config.width,
-            height: config.height,
-            resolvingPowerId: config.id,
-          }),
-        });
-        window.currentPhoneSize = config;
-      }
-      // wsss.addEventListener('message', function (event) {
-      //   console.log(
-      //     '🚀 ~ file: WXtrialInterface.html ~ line 1476 ~ event',
-      //     event,
-      //   );
-      // });
-      $('#phone-size-list').on('click', '.phone-size-item', function (e) {
-        const data = $(e.currentTarget).data();
-        window.activePhoneSize = data;
-        updatePhoneSizeListHtml();
-        // setPhoneSize(data.width, data.height);
-      });
-      $('#set-phone-size-dialog .dialog-btn.confirm').on('click', function (e) {
-        setPhoneSize(window.activePhoneSize);
-        $('#set-phone-size-dialog').removeClass('show');
-      });
     </script>
     <script type="text/javascript" src="WXdraw.js"></script>
     <script type="text/javascript" src="aac.js"></script>

static/screenIos/WXdraw.js

@@ -1,15 +1,15 @@
 // 蒙版
-var canvas_bak = document.getElementById('box');
+var canvas_bak = document.getElementById("box");;
 
 var winHeight = window.screen.height - window.innerHeight;
 var vowidth = window.screen.width;
 var topwinHeightDraw = window.screen.height - window.innerHeight + 30; //计算title top 头部
-var numse = window.screen.height; // -winHeight
+var numse = window.screen.height // -winHeight
 //计算title top 头部
 if (numse <= 70) {
-  var voheight = window.screen.height - winHeight - 34 - 20;
+  var voheight = window.screen.height - winHeight - 34 - 20
 } else {
-  var voheight = window.screen.height - topwinHeightDraw - 20;
+  var voheight = window.screen.height - topwinHeightDraw - 20
 }
 
 //画笔大小
@@ -40,37 +40,31 @@ function throttle(fn, delay) {
 }
 
 function doConnectDirectives() {
-  videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720;
-  videoHeight = videoWidth === 720 ? 1280 : 1920;
+  videoWidth = Number(resolvingPower) ? Number(resolvingPower) : 720
+  videoHeight = videoWidth === 720 ? 1280 : 1920
   wsss = new WebSocket(cUrl);
   wsss.binaryType = 'arraybuffer';
 
   wsss.onopen = function () {
     // 获取虚拟场景状态
-    var pings = { type: 'getVsStatus' };
+    var pings = { "type": "getVsStatus" }
     wsss.send(JSON.stringify(pings));
     var bitRate = {
-      data: {
-        bitRate: 1243000,
+      "data": {
+        "bitRate": 1243000
       },
-      type: 'bitRate',
-    };
+      "type": "bitRate"
+    }
     wsss.send(JSON.stringify(bitRate));
     // 进入发起询问
     var pings2 = {
-      type: 'forwardMsg',
-      data: {
-        code: '3000',
-        desc: '询问是否有在控制', // 可选
-      },
-    };
+      "type": "forwardMsg",
+      "data": {
+        "code": "3000",
+        "desc": "询问是否有在控制" // 可选
+      }
+    }
     wsss.send(JSON.stringify(pings2));
-
-    wsss.send(
-      JSON.stringify({
-        type: 'getPhoneSize',
-      }),
-    );
   };
   wsss.onerror = function () {
     wsss.close();
@@ -80,71 +74,45 @@ function doConnectDirectives() {
     }
   };
   wsss.onmessage = function (res) {
-    var result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data;
-    console.log(
-      '🚀 ~ file: WXdraw.js ~ line 78 ~ doConnectDirectives ~ result',
-      result,
-    );
-
+    var result = typeof res.data === 'string' ? JSON.parse(res.data) : res.data
     if (result.type === 'cutting') {
       if (result.data.status === 0) {
-        $.toast('复制成功', 'text');
+        $.toast('复制成功', "text");
       } else {
-        $.toast(result.msg, 'text');
+        $.toast(result.msg, "text");
       }
-      return;
+      return
     }
-    if (result.type === 'forwardMsg') {
-      if (isAuth !== 'none') {
-        if (result.data.code === 4000 || result.data.code === 3000) {
-          if (isAuth === 'huo') {
-            $.confirm(
-              '授权方已收回控制权，您进入观看屏幕模式',
-              function () {
-                //点击确认后的回调函数
-                isControl = false;
-              },
-              function () {
-                isControl = false;
-                //点击取消后的回调函数
-                quit();
-              },
-            );
-          } else {
-            $.confirm(
-              '当前云手机正在授控，是否请求获取云手机控制权？',
-              function () {
-                //点击确认后的回调函数
-                var ping = {
-                  type: 'forwardMsg',
-                  data: {
-                    code: '5000',
-                    desc: '控制权限收回', // 可选
-                  },
-                };
-                wsss.send(JSON.stringify(ping));
-                isControl = true;
-              },
-              function () {
-                //点击取消后的回调函数
-                isControl = false;
-              },
-            );
-          }
-          return;
+    if (result.type === 'forwardMsg' && isAuth !== 'none') {
+      if (result.data.code === 4000 || result.data.code === 3000) {
+        if (isAuth === 'huo') {
+          $.confirm("授权方已收回控制权，您进入观看屏幕模式", function () {
+            //点击确认后的回调函数
+            isControl = false;
+          }, function () {
+            isControl = false;
+            //点击取消后的回调函数
+            quit();
+          });
+        } else {
+          $.confirm("当前云手机正在授控，是否请求获取云手机控制权？", function () {
+            //点击确认后的回调函数
+            var ping = {
+              "type": "forwardMsg",
+              "data": {
+                "code": "5000",
+                "desc": "控制权限收回" // 可选
+              }
+            }
+            wsss.send(JSON.stringify(ping));
+            isControl = true;
+          }, function () {
+            //点击取消后的回调函数
+            isControl = false;
+          });
         }
-        return;
       }
-      if (result.data.code === 'phoneSizeChange') {
-        // console.log(result.data);
-        window.currentPhoneSize = {
-          id: result.data.id,
-          width: result.data.width,
-          height: result.data.height,
-        };
-        return;
-      }
-      return;
+      return
     }
     if (result.type === 'payInitiateEvent') {
       var url = window.location.href;
@@ -161,125 +129,98 @@ function doConnectDirectives() {
         dataType: 'json',
         contentType: 'application/json;charset=UTF-8',
         success: function (res) {
-          if (result.data.payType === 1) {
-            // 微信
-            if (window.__wxjs_environment === 'miniprogram') {
-              // 小程序
+          if(result.data.payType === 1) { // 微信
+            if (window.__wxjs_environment === 'miniprogram') { // 小程序
               // copyUrl(result.data.payUrl);
             } else {
-              window.location.href = result.data.payUrl;
+              window.location.href = result.data.payUrl
             }
           } else {
-            window.location.href = result.data.payUrl;
+            window.location.href = result.data.payUrl
           }
         },
       });
-      return;
-    }
-    if (result.type === 'getPhoneSize') {
-      // console.log(result);
-      const data = window.phoneSizeList.find(function (v) {
-        return v.width === result.data.width && v.height === result.data.height;
-      });
-      window.currentPhoneSize = data || {
-        width: result.data.width,
-        height: result.data.height,
-      };
-      return;
+      return
     }
-  };
+  }
 }
-$('body').on('click', function () {
-  draw_graph('pencil', this);
-});
+$('body').on("click", function () {
+  draw_graph('pencil', this)
+})
 //剪切板
-$('.upload').on('click', function () {
-  var texts = $(this).attr('data-text');
-  if (texts == 'uploads') {
-    $('.mainbox').css({
-      display: 'block',
-    });
-    $('.sbox').css({
-      display: 'none',
-    });
+$(".upload").on("click", function () {
+  var texts = $(this).attr("data-text")
+  if (texts == "uploads") {
+    $(".mainbox").css({
+      "display": "block"
+    })
+    $(".sbox").css({
+      "display": "none"
+    })
   }
-});
+})
 
 //home 控制home
-$('.botmat1img').on('click', function () {
-  var codes = $(this).attr('data-text');
-  if (codes == 'home' && isControl) {
+$(".botmat1img").on("click", function () {
+  var codes = $(this).attr("data-text")
+  if (codes == "home" && isControl) {
     wsss.send(ExexuteKeyBoard(3));
-  } else if (codes == 'return' && isControl) {
+  } else if (codes == "return" && isControl) {
     wsss.send(ExexuteKeyBoard(4));
-  } else if (codes == 'gengduo' && isControl) {
+  } else if (codes == "gengduo" && isControl) {
     wsss.send(ExexuteKeyBoard(187));
   }
-});
+})
 // 高清控制
-$('.PictureQuality').on('click', function () {
+$(".PictureQuality").on("click", function () {
   if (!isControl) {
-    return;
+    return
   }
-  $(this).addClass('avit').siblings().removeClass('avit');
-  var id = $(this).attr('data-id');
+  $(this).addClass("avit").siblings().removeClass('avit')
+  var id = $(this).attr("data-id")
   var cmd = {
-    type: 'switchSharpness',
+    type: "switchSharpness",
   };
 
-  decodeWoker.postMessage(cmd); //通知解码器worker切换分辨率
+  decodeWoker.postMessage(cmd);//通知解码器worker切换分辨率		
   var buffer = makeSharpness(Number(id));
   webSocketWorker.postMessage(buffer);
-});
+})
 var canDraw = false;
 //画图形
 var draw_graph = function (graphType) {
   //把蒙版放于画板上面
-  $('#container').css('z-index', 30);
-  $('#dedit').css('z-index', 20);
+  $("#container").css("z-index", 30);
+  $("#dedit").css("z-index", 20);
   // 先画在蒙版上 再复制到画布上
   //鼠标按下获取 开始xy开始画图
   var ongoingTouches = [];
   var touchstart = function (e) {
     if (!isControl) {
-      return;
+      return
     }
     $('.control-right-img').attr({
-      'data-id': '2',
-    });
-    $('.leftmains').css({
-      right: '-4rem',
-    });
+      "data-id": "2"
+    })
+    $(".leftmains").css({
+      "right": "-4rem"
+    })
     var touchfor = e.originalEvent.changedTouches; //for 的手指数组
     //是否横屏
     for (var i = 0; i < touchfor.length; i++) {
-      // var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
-      // var acrossHeightY =
-      //   videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
-
-      var verticalWidthX =
-        touchfor[i].pageX * (window.currentPhoneSize.width / vowidth);
-      var verticalHeightY =
-        touchfor[i].pageY * (window.currentPhoneSize.width / voheight);
+      var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
+      var acrossHeightY = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalWidthX = touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalHeightY = touchfor[i].pageY * (videoHeight / voheight);
       var idx = ongoingTouches.findIndex(function (ele) {
-        return ele.identifier === touchfor[i].identifier;
-      });
+        return ele.identifier === touchfor[i].identifier
+      })
       if (idx < 0) {
         ongoingTouches.push(touchfor[i]);
       }
-      var ping =
-        //  resolving == 0 ?
-        //   { "data": { "action": 0, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
-        {
-          data: {
-            action: 0,
-            count: ongoingTouches.length,
-            pointerId: touchfor[i].identifier,
-            x: verticalWidthX.toFixed(2),
-            y: verticalHeightY.toFixed(2),
-          },
-          type: 'event',
-        };
+      var ping = resolving == 0 ?
+        { "data": { "action": 0, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
+        { "data": { "action": 0, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": verticalWidthX.toFixed(2), "y": verticalHeightY.toFixed(2) }, "type": "event" };
       wsss.send(JSON.stringify(ping));
     }
     canDraw = true;
@@ -288,37 +229,24 @@ var draw_graph = function (graphType) {
   //鼠标离开 把蒙版canvas的图片生成到canvas中
   var touchend = function (e) {
     if (!isControl) {
-      return;
+      return
     }
     var touchfor = e.originalEvent.changedTouches; //for 的手指数组
     //是否横屏
     for (var i = 0; i < touchfor.length; i++) {
-      // var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
-      // var acrossHeightY =
-      //   videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
-      var verticalWidthX =
-        touchfor[i].pageX * (window.currentPhoneSize.width / vowidth);
-      var verticalHeightY =
-        touchfor[i].pageY * (window.currentPhoneSize.height / voheight);
-      var ping =
-        // resolving == 0 ?
-        //   { "data": { "action": 1, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
-        {
-          data: {
-            action: 1,
-            count: ongoingTouches.length,
-            pointerId: touchfor[i].identifier,
-            x: verticalWidthX.toFixed(2),
-            y: verticalHeightY.toFixed(2),
-          },
-          type: 'event',
-        };
+      var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
+      var acrossHeightY = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalWidthX = touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalHeightY = touchfor[i].pageY * (videoHeight / voheight);
+      var ping = resolving == 0 ?
+        { "data": { "action": 1, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
+        { "data": { "action": 1, "count": ongoingTouches.length, "pointerId": touchfor[i].identifier, "x": verticalWidthX.toFixed(2), "y": verticalHeightY.toFixed(2) }, "type": "event" };
       wsss.send(JSON.stringify(ping));
       ongoingTouches.forEach(function (item, index) {
         if (item.identifier === touchfor[i].identifier) {
-          ongoingTouches.splice(index, 1);
+          ongoingTouches.splice(index, 1)
         }
-      });
+      })
     }
     canDraw = false;
   };
@@ -326,35 +254,22 @@ var draw_graph = function (graphType) {
   //清空层 云手机超出屏幕的开关
   var clearContext = function () {
     canDraw = false;
-  };
+  }
 
   // 鼠标移动
   var touchmove = function (e) {
     if (!isControl) {
-      return;
+      return
     }
     var touchfor = e.originalEvent.targetTouches; //for 的手指数组
     for (var i = 0; i < touchfor.length; i++) {
-      // var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
-      // var acrossHeightY =
-      //   videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
-      var verticalWidthX =
-        touchfor[i].pageX * (window.currentPhoneSize.width / vowidth);
+      var acrossWidthX = touchfor[i].pageY * (videoHeight / voheight);
+      var acrossHeightY = videoWidth - touchfor[i].pageX * (videoWidth / vowidth);
+      var verticalWidthX = touchfor[i].pageX * (videoWidth / vowidth);
       var verticalHeightY = touchfor[i].pageY * (videoHeight / voheight);
-      window.currentPhoneSize.height;
-      var ping =
-        // resolving == 0 ?
-        //   { "data": { "action": 2, "count": touchfor.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
-        {
-          data: {
-            action: 2,
-            count: touchfor.length,
-            pointerId: touchfor[i].identifier,
-            x: verticalWidthX.toFixed(2),
-            y: verticalHeightY.toFixed(2),
-          },
-          type: 'event',
-        };
+      var ping = resolving == 0 ?
+        { "data": { "action": 2, "count": touchfor.length, "pointerId": touchfor[i].identifier, "x": acrossWidthX.toFixed(2), "y": acrossHeightY.toFixed(2) }, "type": "event" } :
+        { "data": { "action": 2, "count": touchfor.length, "pointerId": touchfor[i].identifier, "x": verticalWidthX.toFixed(2), "y": verticalHeightY.toFixed(2) }, "type": "event" };
       wsss.send(JSON.stringify(ping));
     }
   };
@@ -364,22 +279,22 @@ var draw_graph = function (graphType) {
     if (graphType != 'handwriting') {
       clearContext();
     }
-  };
+  }
   $(canvas_bak).unbind();
   $(canvas_bak).bind('touchstart', touchstart);
   $(canvas_bak).bind('touchmove', touchmove);
   $(canvas_bak).bind('touchend', touchend);
   $(canvas_bak).bind('mouseout', mouseout);
-};
+}
 
 function GetRequest() {
   var url = location.search; // 获取url中"?"符后的字串
   var obj = new Object();
-  if (url.indexOf('?') != -1) {
+  if (url.indexOf("?") != -1) {
     var str = url.substr(1);
-    strs = str.split('&');
+    strs = str.split("&");
     for (var i = 0; i < strs.length; i++) {
-      obj[strs[i].split('=')[0]] = strs[i].split('=')[1];
+      obj[strs[i].split("=")[0]] = (strs[i].split("=")[1]);
     }
   }
   return obj;

static/screenIos/WXtrialInterface.html

@@ -43,24 +43,9 @@
       rel="stylesheet"
       href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css"
     />
-    <!-- <link rel="stylesheet" href="../static/lib/swiper/swiper-bundle.min.css" />
-    <script src="../static/lib/swiper/swiper-bundle.js"></script> -->
-    <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
   </head>
 
   <body class="scroll h-player" style="overscroll-behavior: contain">
-    <template id="template-phone-size-item">
-      {{~ it.list :value:index }}
-      <div
-        class="phone-size-item {{? value.width === it.active.width && value.height === it.active.height }}active{{?}}"
-        data-width="{{= value.width }}"
-        data-height="{{= value.height }}"
-        data-id="{{= value.id }}"
-      >
-        <span>{{= value.width }}x{{= value.height }}</span>
-      </div>
-      {{~}}
-    </template>
     <div class="container" id="player">
       <div class="muted" id="btnMuted">
         <div class="control-right-img" data-id="1">
@@ -74,24 +59,15 @@
       </div>
       <div class="leftmains">
         <div class="PictureQualityMain">
-          <div class="menu-btn PictureQuality" data-id="4">高清</div>
-          <div class="menu-btn PictureQuality avit" data-id="3">标清</div>
-          <div class="menu-btn PictureQuality" data-id="2">极速</div>
-        </div>
-        <div class="">
-          <div class="menu-btn" id="open-set-phone-size-dialog-btn">
-            <span>分辨率</span>
-          </div>
+          <div class="PictureQuality" data-id="4">高清</div>
+          <div class="PictureQuality avit" data-id="3">标清</div>
+          <div class="PictureQuality" data-id="2">极速</div>
         </div>
         <div class="operation">
           <div class="upload" id="showsuss" data-text="uploads">
             <img src="../static/img/wx/shangchuan_icon.png" />
             <div>上传</div>
           </div>
-          <!-- <div class="upload" id="open-set-phone-size-dialog-btn">
-            <img src="../static/img/wx/jianqieban_icon.png" />
-            <div>分辨率</div>
-          </div> -->
           <div class="upload" onclick="showShearPlate()" data-text="Shearplate">
             <img src="../static/img/wx/jianqieban_icon.png" />
             <div>剪贴板</div>
@@ -173,26 +149,6 @@
         </div>
       </div>
     </div>
-
-    <div id="set-phone-size-dialog" class="dialog">
-      <div class="dialog-mask"></div>
-      <!-- 设置分辨率的弹窗 -->
-      <div class="dialog-content-border">
-        <div class="dialog-content">
-          <div class="dialog-header">
-            <div class="dialog-btn cancel">
-              <span>取消</span>
-            </div>
-            <div class="dialog-btn confirm">
-              <span>确定</span>
-            </div>
-          </div>
-          <div class="dialog-main">
-            <div id="phone-size-list"></div>
-          </div>
-        </div>
-      </div>
-    </div>
     <script
       type="text/javascript"
       src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"
@@ -298,10 +254,10 @@
       // 开发环境
       var isDev =
         /^192\.168\./.test(location.host) || /^localhost/.test(location.host);
-      // if (isDev) {
-      //   baseUrl = 'http://gntest.phone.androidscloud.com:1280';
-      //   sourceType = 2;
-      // }
+      if (isDev) {
+        baseUrl = 'http://gntest.phone.androidscloud.com:1280';
+        sourceType = 2;
+      }
 
       var topwinHeight = window.screen.height - window.innerHeight + 30; //计算title top 头部
       var url = window.location.href;
@@ -313,7 +269,7 @@
       var token = parameters['token'];
       var mealType = parameters['mealType'];
       var userCardId = parameters['userCardId'];
-
+      
       var videoTimer = null,
         videoTime = 0,
         adType = 0,
@@ -433,8 +389,7 @@
       setTimeout(() => {
         getDataByKey(db, storeName, userCardId);
       }, 1000);
-      
-      var timerInterval = null, timeInterval = 0;
+
       function connect(type) {
         $.ajax({
           url: baseUrl + '/api/resources/user/cloud/connect',
@@ -450,9 +405,6 @@
           async: false,
           success: function (res) {
             if (res.status === 0) {
-              if (timerInterval) {
-                timerInterval = clearTimeout();
-              }
               if (res.data.internetHttps) {
                 socketURL =
                   'wss://' +
@@ -493,29 +445,10 @@
                 }
               } else {
                 $.toast('网络异常，请稍后重试', 'text');
-                setTimeout(() => {
-                  clearInterval(intervaler);
-                  quit();
-                }, 3000);
               }
-            } else if (res.status === 5200) {
-              if (timeInterval > 7) {
-                $.toast('网络异常，请稍后重试', 'text');
-                timerInterval = clearTimeout()
-                setTimeout(() => {
-                  quit();
-                }, 3000)
-                return
-              }
-              timerInterval = setTimeout(() => {
-                connect(type);
-                timeInterval += 1;
-              }, 3000)
-            }  else {
+            } else {
               $.toast('画面异常,请重新进入', 'text');
-              setTimeout(() => {
-                quit();
-              }, 3000)
+              quit();
             }
           },
         });
@@ -550,76 +483,47 @@
       let timer,
         isFlag = true;
       function showShearPlate() {
-        stopManyClick(function () {
-          new Promise((resolve, reject) => {
-            if (window.navigator.clipboard) {
-              window.navigator.clipboard
-                .readText()
-                .then(
-                  function (content) {
-                    return $.ajax({
-                      url: baseUrl + '/api/public/v5/shear/content',
-                      type: 'post',
-                      dataType: 'json',
-                      data: JSON.stringify({
-                        content: content,
-                      }),
-                      headers: {
-                        'content-Type': 'application/json',
-                        Authorization: token,
-                      },
-                    });
-                  },
-                  function (err) {
-                    $.toast('读取剪贴板失败', 'text');
-                  },
-                )
-                .finally(resolve);
-            } else {
-              resolve();
-            }
-          }).then(function () {
-            $('.box-shear-plate').empty();
-            return $.ajax({
-              url: baseUrl + '/api/public/v5/shear/content',
-              headers: {
-                Authorization: token,
-              },
-              type: 'get',
-              dataType: 'json',
-              success: function (res) {
-                if (res.status === 0) {
-                  if (res.data.length) {
-                    cutList = array_unique(res.data);
-                    var str =
-                      '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
-                    cutList.forEach(function (item) {
-                      str +=
-                        "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
-                        item.content +
-                        '")\'>' +
-                        item.content +
-                        "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
-                        item.id +
-                        ")'>删除</button></div></div></div>";
-                    });
-                    str += '</div>';
-                    $('.box-shear-plate').append(str);
-                  } else {
-                    $('.box-shear-plate').append(
-                      '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
-                    );
-                  }
-                  $('.mask').show();
-                  initSlider();
+        stopManyClick(() => {
+          $('.box-shear-plate').empty();
+          $.ajax({
+            url: baseUrl + '/api/public/v5/shear/content',
+            headers: {
+              Authorization: token,
+            },
+            type: 'get',
+            dataType: 'json',
+            success: function (res) {
+              if (res.status === 0) {
+                if (res.data.length) {
+                  cutList = array_unique(res.data);
+                  var str =
+                    '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">';
+                  cutList.forEach(function (item) {
+                    str +=
+                      "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" +
+                      item.content +
+                      '")\'>' +
+                      item.content +
+                      "</div></div><div class='slide-content-button'><button onclick='handleDelete(" +
+                      item.id +
+                      ")'>删除</button></div></div></div>";
+                  });
+                  str += '</div>';
+                  $('.box-shear-plate').append(str);
                 } else {
                   $('.box-shear-plate').append(
                     '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
                   );
-                  $('.mask').show();
                 }
-              },
-            });
+                $('.mask').show();
+                initSlider();
+              } else {
+                $('.box-shear-plate').append(
+                  '<img class="empty" src="img/jianqieban_pic@2x.png" alt="" /><div class="empty-txt">剪贴板为空</div>',
+                );
+                $('.mask').show();
+              }
+            },
           });
         });
       }
@@ -979,13 +883,10 @@
           case 0:
             break;
           case 1:
-            // console.log(objData);
             if (logicWidth != objData.width || logicHeight != objData.height) {
               logicWidth = objData.width;
               logicHeight = objData.height;
             }
-            // logicWidth = 375
-            // logicHeight = 812
             webglPlayer.renderFrame(
               objData.data,
               logicWidth,
@@ -1027,7 +928,6 @@
             '&cardToken=' +
             encodeURIComponent(cardToken),
         );
-        window.webSocketWorker = webSocketWorker;
         webSocketWorker.onmessage = function (event) {
           var input = event.data;
           if (input[0] == 0xff && isAudioPlay) {
@@ -1063,12 +963,10 @@
                 console.log('安卓卡此时竖屏');
                 //竖屏处理
                 resolving = 1;
-                $('#playCanvas').removeClass('horizontal').addClass('vertical');
               } else {
                 console.log('安卓卡此时横屏');
                 //横屏处理
                 resolving = 0;
-                $('#playCanvas').removeClass('vertical').addClass('horizontal');
               }
             }
             if (input[23] == 0x0b) {
@@ -1077,11 +975,9 @@
           }
           if (event.data === 'close') {
             $.toast('画面异常,请重新进入', 'text');
-            setTimeout(() => {
-              decodeWoker.postMessage('close');
-              decodeWoker.terminate();
-              quit();
-            }, 3000);
+            decodeWoker.postMessage('close');
+            decodeWoker.terminate();
+            quit();
           }
         };
       }
@@ -1279,12 +1175,9 @@
       // 观看广告次数上报1
       function reportFrequency() {
         $.ajax({
-          url:
-            baseUrl +
-            '/api/resoures/v1/trial/reportFrequency/' +
-            form.userCardId,
+          url: baseUrl + '/api/resoures/v1/trial/reportFrequency/' + form.userCardId,
           headers: {
-            Authorization: form.token,
+            Authorization: form.token
           },
           type: 'post',
           contentType: 'application/json',
@@ -1311,8 +1204,8 @@
       }
       //关闭广告
       $('.time-close-wrap')[0].addEventListener('click', () => {
-        if (videoTime == 0) {
-          reportFrequency();
+        if(videoTime == 0) {
+          reportFrequency()
         }
         $('.buy-phone-wrap').eq(0).show();
       });
@@ -1402,152 +1295,10 @@
           });
         } else {
           uni.webView.navigateBack({
-            delta: 1,
+	          delta: 1
           });
         }
       }
-
-      function updatePhoneSizeListHtml() {
-        const templatePhoneSizeItem = doT.template(
-          $('#template-phone-size-item').html().replace(/&amp;/g, '&'),
-        );
-        const phoneSizeListItemsHtml = templatePhoneSizeItem({
-          list: window.phoneSizeList,
-          active: window.activePhoneSize,
-        });
-        $('#phone-size-list').html(phoneSizeListItemsHtml);
-      }
-
-      $('#open-set-phone-size-dialog-btn').on('click', function (e) {
-        window.activePhoneSize = window.currentPhoneSize;
-        updatePhoneSizeListHtml();
-        $('#set-phone-size-dialog').addClass('show');
-      });
-      // $('#set-phone-size-dialog').addClass('show');
-      $('.dialog .dialog-mask')
-        .add('.dialog .dialog-btn.cancel')
-        .on('click', function (e) {
-          $(e.currentTarget).parents('.dialog').removeClass('show');
-        });
-
-      // 分辨率列表
-      window.phoneSizeList = [];
-      // 当前生效的分辨率
-      window.currentPhoneSize = {
-        // id: 1,
-        width: 720,
-        height: 1280,
-      };
-      // 选中的分辨率
-      window.activePhoneSize = window.currentPhoneSize;
-
-      function getPhoneSizeList() {
-        return $.ajax({
-          url:
-            baseUrl + '/api/resources/v5/machine/resolution/getResolvingPower',
-          headers: {
-            Authorization: token,
-          },
-          type: 'get',
-          dataType: 'json',
-          data: {
-            userCardId,
-          },
-        }).then(function (response) {
-          return response.data.map(function (v) {
-            return {
-              id: v.id,
-              dpi: v.dpi,
-              width: v.width || v.abscissa,
-              height: v.height || v.ordinate || v.high,
-            };
-          });
-        });
-      }
-
-      getPhoneSizeList().then(function (phoneSizeList) {
-        window.phoneSizeList = phoneSizeList;
-        const currentPhoneSize = window.phoneSizeList.find(function (v) {
-          return (
-            v.width === window.currentPhoneSize.width &&
-            v.height === window.currentPhoneSize.height
-          );
-        });
-        window.currentPhoneSize = currentPhoneSize || window.currentPhoneSize;
-        return updatePhoneSizeListHtml();
-      });
-
-      // const phoneSizeListSwiper = new Swiper('#phone-size-list-swiper', {
-      //   direction: 'vertical',
-      //   slidesPerView: 'auto',
-      //   loop: false,
-      //   centeredSlides: true,
-      // });
-      function setPhoneSize(config) {
-        // 修改云机分辨率
-        wsss.send(
-          JSON.stringify({
-            type: 'setPhoneSize',
-            data: {
-              width: config.width,
-              height: config.height,
-            },
-          }),
-        );
-        // 通知其他在线端
-        wsss.send(
-          JSON.stringify({
-            type: 'forwardMsg',
-            data: {
-              code: 'phoneSizeChange',
-              id: config.id,
-              width: config.width,
-              height: config.height,
-              desc: '分辨率修改', // 可选
-            },
-          }),
-        );
-        // 上报分辨率
-        $.ajax({
-          url:
-            baseUrl +
-            '/api/resources/v5/machine/resolution/operationResolvingPower',
-          headers: {
-            Authorization: token,
-          },
-          type: 'post',
-          dataType: 'json',
-          contentType: 'application/json; charset=UTF-8',
-          data: JSON.stringify({
-            userCardId: window.userCardId,
-            width: config.width,
-            height: config.height,
-            resolvingPowerId: config.id,
-          }),
-        });
-
-        window.currentPhoneSize = config;
-      }
-      // wsss.addEventListener('message', function (event) {
-      //   console.log(
-      //     '🚀 ~ file: WXtrialInterface.html ~ line 1476 ~ event',
-      //     event,
-      //   );
-      // });
-      $('#phone-size-list').on('click', '.phone-size-item', function (e) {
-        const data = $(e.currentTarget).data();
-        console.log(
-          '🚀 ~ file: WXtrialInterface.html ~ line 1494 ~ data',
-          data,
-        );
-        window.activePhoneSize = data;
-        updatePhoneSizeListHtml();
-        // setPhoneSize(data.width, data.height);
-      });
-      $('#set-phone-size-dialog .dialog-btn.confirm').on('click', function (e) {
-        setPhoneSize(window.activePhoneSize);
-        $('#set-phone-size-dialog').removeClass('show');
-      });
     </script>
     <script type="text/javascript" src="WXdraw.js"></script>
     <script type="text/javascript" src="aac.js"></script>

static/screenIos/decoder.js

@@ -6,17 +6,18 @@ var ret;
 var maxWidth = 1080;
 var maxHeight = 1920;
 var globalYuvPtr = undefined;
-var golbalYuvData; //全局，只分配一次
+var golbalYuvData;//全局，只分配一次
 var renderCount = 0;
 var curFrameWidth = undefined;
 var curFrameHeight = undefined;
 
+
 function doSomeInit() {
   var allocSize = maxWidth * maxHeight * 3;
   golbalYuvData = new Uint8Array(allocSize);
 }
-self.importScripts('ffmpeghelper.js');
-self.importScripts('spsParser.js');
+self.importScripts("ffmpeghelper.js");
+self.importScripts("spsParser.js");
 
 self.Module.onRuntimeInitialized = function () {
   isFinish = true;
@@ -24,49 +25,43 @@ self.Module.onRuntimeInitialized = function () {
   ret = Module._openDecoder();
 
   if (!ret) {
-    console.log('打开编码器成功');
+    console.log("打开编码器成功");
   }
-};
-
-self.addEventListener(
-  'message',
-  function (e) {
-    var msg = e.data;
-    if (msg.type == 'rawData') {
-      var buffer = e.data.data;
-
-      if (buffer[0] !== 0xff) {
-        // 音频解码
-        var type = buffer[4] & 0x1f;
-        if (type == 7) {
-          let info = spsParser(buffer);
-
-          if (curFrameWidth != undefined && curFrameHeight != undefined) {
-            if (info.width != curFrameWidth || info.height != curFrameHeight) {
-              // 分辨率发生改变，切换
-              console.log('🚀 ~ file: decoder.js ~ line 44 ~ 分辨率发生改变');
-              switchNewStream();
-            }
-          }
+}
+
+self.addEventListener('message', function (e) {
+  var msg = e.data;
+  if (msg.type == "rawData") {
+    var buffer = e.data.data;
 
-          curFrameWidth = info.width;
-          curFrameHeight = info.height;
-          h264Queue.push(buffer);
-        } else {
-          h264Queue.push(buffer);
+    if (buffer[0] !== 0xff) { // 音频解码
+      var type = buffer[4] & 0x1f;
+      if (type == 7) {
+        let info = spsParser(buffer);
+
+        if (curFrameWidth != undefined && curFrameHeight != undefined) {
+          if (info.width != curFrameWidth || info.height != curFrameHeight) { // 分辨率发生改变，切换		
+            switchNewStream();
+          }
         }
+
+        curFrameWidth = info.width;
+        curFrameHeight = info.height;
+        h264Queue.push(buffer);
+      } else {
+        h264Queue.push(buffer);
       }
+
     }
-  },
-  false,
-);
+  }
+}, false);
 
 function PrintfLog(str) {
   var curTime = new Date().getTime();
   var objData = {
     cmd: 0,
     data: str,
-    time: curTime,
+    time: curTime
   };
   self.postMessage(objData);
 }
@@ -78,27 +73,23 @@ function doRequestIFrame() {
   self.postMessage(objData);
 }
 
+
 function decodeVideo() {
   if (h264Queue.length > 0 && isFinish) {
     decodeH264(h264Queue.shift());
   }
 }
 
+
 var timeFlag = setInterval(decodeVideo, 1);
 
 //实现C 端到js yuv数据赋值, 并分配给opengl 渲染
 /*yuvData, 存放yuv数据的数组
- * inputYuvPtr C++
- */
-function dispatchYuvData(
-  yuvData,
-  inputYuvPtr,
-  videoWidth,
-  videoHeight,
-  copyLen,
-) {
+* inputYuvPtr C++ 
+*/
+function dispatchYuvData(yuvData, inputYuvPtr, videoWidth, videoHeight, copyLen) {
   for (i = 0; i < copyLen; i++) {
-    yuvData[i] = Module.HEAPU8[inputYuvPtr + i];
+    yuvData[i] = Module.HEAPU8[(inputYuvPtr) + i];
   }
 
   var curTime = new Date().getTime();
@@ -107,7 +98,7 @@ function dispatchYuvData(
     data: yuvData,
     time: curTime,
     width: videoWidth,
-    height: videoHeight,
+    height: videoHeight
   };
   self.postMessage(objData);
 }
@@ -118,32 +109,23 @@ function decodeH264(data) {
   var inputPtr = Module._malloc(data.length); //输入数据
 
   for (var i = 0; i < data.length; i++) {
-    Module.HEAPU8[inputPtr + i] = data[i]; //转换为堆数据
+    Module.HEAPU8[(inputPtr) + i] = data[i]; //转换为堆数据
   }
 
-  var allocSize = (maxWidth * maxHeight * 3) / 2;
+  var allocSize = maxWidth * maxHeight * 3 / 2;
   if (globalYuvPtr == undefined) {
     globalYuvPtr = Module._malloc(allocSize);
   }
 
   var ret = Module._feedData(inputPtr, data.length, globalYuvPtr);
 
-  if (ret >= 0) {
-    //解码成功才考虑渲染
-    frameWidth = Module._getVideoWidth(); //拿到解码器宽、高
+  if (ret >= 0) { //解码成功才考虑渲染
+    frameWidth = Module._getVideoWidth();//拿到解码器宽、高
     frameHeight = Module._getVideoHeight();
-    // console.log("🚀 ~ file: decoder.js ~ line 134 ~ decodeH264 ~ frameWidth", frameWidth,frameHeight)
-    var copyLen = (frameWidth * frameHeight * 3) / 2; //只拷贝必须的长度
-
-    if (renderCount > 1) {
-      //第一帧因为画面时全绿色的不渲染
-      dispatchYuvData(
-        golbalYuvData,
-        globalYuvPtr,
-        frameWidth,
-        frameHeight,
-        copyLen,
-      );
+    var copyLen = frameWidth * frameHeight * 3 / 2;//只拷贝必须的长度
+
+    if (renderCount > 1) { //第一帧因为画面时全绿色的不渲染
+      dispatchYuvData(golbalYuvData, globalYuvPtr, frameWidth, frameHeight, copyLen);
     } else {
       renderCount++;
     }
@@ -153,14 +135,15 @@ function decodeH264(data) {
 }
 
 function switchNewStream() {
+
   closeDecoder();
-  var ret = Module._openDecoder(); //再次开启解码器
+  var ret = Module._openDecoder();//再次开启解码器	
   var timeFlag = setInterval(decodeVideo, 1);
-  console.log('切换解码器成功');
+  console.log("切换解码器成功");
 }
 
 function closeDecoder() {
-  clearInterval(timeFlag); //关闭原有定时器
+  clearInterval(timeFlag);//关闭原有定时器
   Module._closeDecoder();
   renderCount = 0;
 
@@ -168,7 +151,7 @@ function closeDecoder() {
     Module._free(globalYuvPtr);
     globalYuvPtr = undefined;
   }
-  console.log('此时buffer长度: %d', h264Queue.length);
+  console.log("此时buffer长度: %d", h264Queue.length);
   while (h264Queue.lengh > 0) {
     h264Queue.shift();
   }

static/static/lib/doT-1.1.3/.eslintrc.yml

@@ -1,24 +0,0 @@
-env:
-  node: true
-extends: 'eslint:recommended'
-globals:
-  define: false
-parserOptions:
-  ecmaVersion: 5
-rules:
-  no-trailing-spaces: 2
-  linebreak-style: [ 2, unix ]
-  semi: [ 2, always ]
-  valid-jsdoc: [ 2, { requireReturn: false } ]
-  no-unused-vars: [ 2, { args: none } ]
-  no-console: 0
-  block-scoped-var: 2
-  dot-location: [ 2, property ]
-  dot-notation: 2
-  no-else-return: 2
-  no-eq-null: 2
-  no-fallthrough: 2
-  no-return-assign: 2
-  no-use-before-define: [ 2, nofunc ]
-  no-path-concat: 2
-  no-useless-escape: 0

static/static/lib/doT-1.1.3/.gitignore

@@ -1,33 +0,0 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
-
-# MacOS directory info files
-.DS_Store
-
-package-lock.json

static/static/lib/doT-1.1.3/.travis.yml

@@ -1,8 +0,0 @@
-language: node_js
-node_js:
-  - "8"
-  - "10"
-  - "12"
-  - "13"
-after_script:
-  - coveralls < coverage/lcov.info

static/static/lib/doT-1.1.3/LICENSE-DOT.txt

@@ -1,24 +0,0 @@
-
-Copyright (c) 2011 Laura Doktorova
-
-Software includes portions from jQote2 Copyright (c) 2010 aefxx,
-http://aefxx.com/ licensed under the MIT license.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

static/static/lib/doT-1.1.3/README.md

@@ -1,106 +0,0 @@
-# doT
-
-Created in search of the fastest and concise JavaScript templating function with emphasis on performance under V8 and nodejs. It shows great performance for both nodejs and browsers.
-
-doT.js is fast, small and has no dependencies.
-
-[![Build Status](https://travis-ci.org/olado/doT.svg?branch=master)](https://travis-ci.org/olado/doT)
-[![npm version](https://badge.fury.io/js/dot.svg)](https://www.npmjs.com/package/dot)
-[![Coverage Status](http://coveralls.io/repos/github/olado/doT/badge.svg?branch=master)](https://coveralls.io/github/olado/doT?branch=master)
-
-
-## Features
-    custom delimiters
-    runtime evaluation
-    runtime interpolation
-    compile-time evaluation
-    partials support
-    conditionals support
-    array iterators
-    encoding
-    control whitespace - strip or preserve
-    streaming friendly
-    use it as logic-less or with logic, it is up to you
-
-## Docs, live playground and samples
-
-http://olado.github.com/doT (todo: update docs with new features added in version 1.0.0)
-
-## New in version 1.0.0
-
-#### Added parameters support in partials
-
-```html
-{{##def.macro:param:
-	<div>{{=param.foo}}</div>
-#}}
-
-{{#def.macro:myvariable}}
-```
-
-#### Node module now supports auto-compilation of dot templates from specified path
-
-```js
-var dots = require("dot").process({ path: "./views"});
-```
-
-This will compile .def, .dot, .jst files found under the specified path.
-Details
-   * It ignores sub-directories.
-   * Template files can have multiple extensions at the same time.
-   * Files with .def extension can be included in other files via {{#def.name}}
-   * Files with .dot extension are compiled into functions with the same name and
-   can be accessed as renderer.filename
-   * Files with .jst extension are compiled into .js files. Produced .js file can be
-   loaded as a commonJS, AMD module, or just installed into a global variable (default is set to window.render)
-   * All inline defines defined in the .jst file are
-   compiled into separate functions and are available via _render.filename.definename
- 
-   Basic usage:
- ```js
-        var dots = require("dot").process({path: "./views"});
-        dots.mytemplate({foo:"hello world"});
- ```
-   The above snippet will:
-	* Compile all templates in views folder (.dot, .def, .jst)
-  	* Place .js files compiled from .jst templates into the same folder
-     	   These files can be used with require, i.e. require("./views/mytemplate")
-  	* Return an object with functions compiled from .dot templates as its properties
-  	* Render mytemplate template
- 
-#### CLI tool to compile dot templates into js files
-
-	./bin/dot-packer -s examples/views -d out/views
-
-## Example for express
-	Many people are using doT with express. I added an example of the best way of doing it examples/express:
-
-[doT with express](examples/express)
-
-## Notes
-    doU.js is here only so that legacy external tests do not break. Use doT.js.
-    doT.js with doT.templateSettings.append=false provides the same performance as doU.js.
-
-## Security considerations
-
-doT allows arbitrary JavaScript code in templates, making it one of the most flexible and powerful templating engines. It means that doT security model assumes that you only use trusted templates and you don't use any  user input as any part of the template, as otherwise it can lead to code injection.
-
-It is strongly recommended to compile all templates to JS code as early as possible. Possible options:
-
-- using doT as dev-dependency only and compiling templates to JS files, for example, as described above or using a custom script, during the build. This is the most performant and secure approach and it is strongly recommended.
-- if the above approach is not possible for some reason (e.g. templates are dynamically generated using some run-time data), it is recommended to compile templates to in-memory functions during application start phase, before any external input is processed.
-- compiling templates lazily, on demand, is less safe. Even though the possibility of the code injection via prototype pollution was patched (#291), there may be some other unknown vulnerabilities that could lead to code injection.
-
-Please report any found vulnerabilities to npm, not via issue tracker.
-
-## Author
-Laura Doktorova [@olado](http://twitter.com/olado)
-
-## License
-doT is licensed under the MIT License. (See LICENSE-DOT)
-
-<p align="center">
-  <img src="http://olado.github.io/doT/doT-js-100@2x.png" alt="logo by Kevin Kirchner"/>
-</p>
-
-Thank you [@KevinKirchner](https://twitter.com/kevinkirchner) for the logo.

static/static/lib/doT-1.1.3/benchmarks/compileBench.js

@@ -1,110 +0,0 @@
-(function() {
-	var jslitmus, _, doU, doT,
-		data = { f1: 1, f2: 2, f3: 3, f4: "http://bebedo.com/laura"},
-		snippet = "<h1>Just static text</h1>\
-		<p>Here is a simple {{=it.f1}} </p>\
-		<div>test {{=it.f2}}\
-		<div>{{=it.f3}}</div>\
-		<div>{{!it.f4}}</div>\
-		</div>";
-
-	if (typeof module !== 'undefined' && module.exports) {
-		runTests();
-	} else {
-		window.onload = runTestsInBrowser;
-	}
-
-	function testsetup(snippet) {
-
-		jslitmus.test('doU.js', function() {
-			doU.template(snippet);
-		});
-
-		jslitmus.test('doU.js - looping', function(count) {
-			while (count--) {
-				doU.template(snippet);
-			}
-		});
-
-		jslitmus.test('doT.js - using this', function() {
-			doT.template(snippet);
-		});
-
-		jslitmus.test('doT.js - using this - looping', function(count) {
-			while (count--) {
-				doT.template(snippet);
-			}
-		});
-	}
-
-	function runTests() {
-		//var util = require('util');
-		jslitmus = require('./jslitmus.js');
-		doU = require('./templating/doU.js');
-		doT = require('./templating/doT.js');
-		var passOne = 0;
-		console.log("*** Compilation speed test");
-		console.log("*** Small template length: " + snippet.length);
-		testsetup(snippet);
-		// Log the test results
-		jslitmus.on('complete', function(test) {
-			//console.log(util.inspect(process.memoryUsage()));
-			console.log(test.toString());
-		});
-		// 'all_complete' fires when all tests have finished.
-		jslitmus.on('all_complete', function() {
-			switch (passOne) {
-			case 0:
-				passOne++;
-				for(var i=0; i<5; i++) { snippet += snippet; }
-				console.log("*** Medium template length: " + snippet.length);
-				break;
-			case 1:
-				passOne++;
-				for(var i=0; i<3; i++) { snippet += snippet; }
-				console.log("*** Large template length: " + snippet.length);
-				break;
-			default:
-				return;
-			}
-
-			jslitmus.clearAll();
-			testsetup(snippet);
-			jslitmus.runAll();
-		});
-		// Run it!
-		jslitmus.runAll();
-	}
-
-	function runTestsInBrowser() {
-		jslitmus = window.jslitmus;doU = window.doU;doT = window.doT;
-
-		var resultTmpl = doT.template("<h3>Template length : {{=it.size}} </h3>	<img src='{{=it.url}}'/>");
-		var currentSet = document.getElementById('small');
-		testsetup(snippet);
-		// 'complete' fires for each test when it finishes.
-		jslitmus.on('complete', function(test) {
-		// Output test results
-			currentSet.innerHTML += test + '<br/>';
-		});
-		// 'all_complete' fires when all tests have finished.
-		jslitmus.on('all_complete', function() {
-			// Get the results image URL
-			var url = jslitmus.getGoogleChart();
-			if (currentSet.id === 'small') {
-				currentSet.innerHTML += resultTmpl({size: snippet.length, url: url});
-				setTimeout(function() {
-					jslitmus.clearAll();
-					currentSet = document.getElementById('large');
-					for(var i=0; i<8; i++) { snippet += snippet; }
-					testsetup(snippet);
-					jslitmus.runAll();
-				}, 10);
-			} else {
-				currentSet.innerHTML += resultTmpl({size: snippet.length, url: url});
-			}
-		});
-		// Run it!
-		jslitmus.runAll();
-	}
-})();

static/static/lib/doT-1.1.3/benchmarks/genspeed.html

@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-
-<title>Templating Test Suite</title>
-
-<script type="text/javascript" src="jslitmus.js"></script>
-<script type="text/javascript" src="templating/doU.js"></script>
-<script type="text/javascript" src="templating/doT.js"></script>
-<script type="text/javascript" src="compileBench.js"></script>
-
-</head>
-
-<body>
-  <h1>Comparing doU.js and doT.js compilation speed</h1>
-  <div id='small' style="float:left;min-width:400px;"><h3>Small template</h3></div>
-  <div id='large' style="float:left;"><h3>Large template</h3></div>
-</body>
-
-</html>

static/static/lib/doT-1.1.3/benchmarks/index.html

@@ -1,22 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-
-<title>Templating Test Suite</title>
-
-<script type="text/javascript" src="jslitmus.js"></script>
-<script type="text/javascript" src="templating/doU.js"></script>
-<script type="text/javascript" src="templating/doT.js"></script>
-<script type="text/javascript" src="templatesBench.js"></script>
-
-</head>
-
-<body>
-  <h1>Comparing doU.js and doT.js</h1>
-  <div id='small' style="float:left;min-width:400px;"><h3>Small template</h3></div>
-  <div id='large' style="float:left;"><h3>Large template</h3></div>
-</body>
-
-</html>

static/static/lib/doT-1.1.3/benchmarks/jslitmus.js

@@ -1,628 +0,0 @@
-// jslitmus.js
-//
-// Copyright (c) 2010, Robert Kieffer, http://broofa.com
-// Available under MIT license (http://en.wikipedia.org/wiki/MIT_License)
-
-(function() {
-  var root = this;
-
-  //
-  // Platform detect
-  //
-
-  var platform = (function() {
-    // Platform info object
-    var p = {
-      name: null,
-      version: null,
-      os: null,
-      description: 'unknown platform',
-      toString: function() {return this.description;}
-    };
-
-    if (root.navigator) {
-      var ua = navigator.userAgent;
-
-      // Detect OS
-      var oses = 'Windows|iPhone OS|(?:Intel |PPC )?Mac OS X|Linux';
-      p.os = new RegExp('((' + oses + ') +[^ \);]*)').test(ua) ? RegExp.$1.replace(/_/g, '.') : null;
-
-      // Detect expected names
-      p.name = /(Chrome|MSIE|Safari|Opera|Firefox|Minefield)/.test(ua) ? RegExp.$1 : null;
-
-      // Detect version
-      if (p.name == 'Opera') {
-        p.version = opera.name;
-      } else if (p.name) {
-        var vre = new RegExp('(Version|' + p.name + ')[ \/]([^ ;]*)');
-        p.version = vre.test(ua) ? RegExp.$2 : null;
-      }
-    } else if (root.process && process.platform) {
-      // Support node.js (see http://nodejs.org)
-      p.name = 'node';
-      p.version = process.version;
-      p.os = process.platform;
-    }
-
-    // Set the description
-    var d = [];
-    if (p.name) d.push(p.name);
-    if (p.version) d.push(' ' + p.version);
-    if (p.os) d.push(' on ' + p.os);
-    if (d.length) p.description = d.join('');
-
-    return p;
-  })();
-
-  //
-  // Context-specific initialization
-  //
-
-  var sys = null, querystring = null;
-  if (platform.name == 'node') {
-    util = require('util');
-    querystring = require('querystring');
-  }
-
-  //
-  // Misc convenience methods
-  //
-
-  function log(msg) {
-    if (typeof(console) != 'undefined') {
-      console.log(msg);
-    } else if (sys) {
-      util.log(msg);
-    }
-  }
-
-  // nil function
-  function nilf(x) {
-    return x;
-  }
-
-  // Copy properties
-  function extend(dst, src) {
-    for (var k in src) {
-      dst[k] = src[k];
-    }
-    return dst;
-  }
-
-  // Array: apply f to each item in a
-  function forEach(a, f) {
-    for (var i = 0, il = (a && a.length); i < il; i++) {
-      var o = a[i];
-      f(o, i);
-    }
-  }
-
-  // Array: return array of all results of f(item)
-  function map(a, f) {
-    var o, res = [];
-    for (var i = 0, il = (a && a.length); i < il; i++) {
-      var o = a[i];
-      res.push(f(o, i));
-    }
-    return res;
-  }
-
-  // Array: filter out items for which f(item) is falsy
-  function filter(a, f) {
-    var o, res = [];
-    for (var i = 0, il = (a && a.length); i < il; i++) {
-      var o = a[i];
-      if (f(o, i)) res.push(o);
-    }
-    return res;
-  }
-
-  // Array: IE doesn't have indexOf in some cases
-  function indexOf(a, o) {
-    if (a.indexOf) return a.indexOf(o);
-    for (var i = 0, l = a.length; i < l; i++) if (a[i] === o) return i;
-    return -1;
-  }
-
-  // Enhanced escape()
-  function escape2(s) {
-    s = s.replace(/,/g, '\\,');
-    s = querystring ? querystring.escape(s) : escape(s);
-    s = s.replace(/\+/g, '%2b');
-    s = s.replace(/ /g, '+');
-    return s;
-  }
-
-  // join(), for objects. Creates url query param-style strings by default
-  function join(o, delimit1, delimit2) {
-    var asQuery = !delimit1 && !delimit2;
-    if (asQuery) {
-      delimit1 = '&';
-      delimit2 = '=';
-    }
-
-    var pairs = [];
-    for (var key in o) {
-      var value = o[key];
-      if (asQuery) value = escape2(value);
-      pairs.push(key + delimit2 + o[key]);
-    }
-    return pairs.join(delimit1);
-  }
-
-  // split(), for object strings. Parses url query param strings by default
-  function split(s, delimit1, delimit2) {
-    var asQuery = !delimit1 && !delimit2;
-    if (asQuery) {
-      s = s.replace(/.*[?#]/, '');
-      delimit1 = '&';
-      delimit2 = '=';
-    }
-
-    if (match) {
-      var o = query.split(delimit1);
-      for (var i = 0; i < o.length; i++) {
-        var pair = o[i].split(new RegExp(delimit2 + '+'));
-        var key = pair.shift();
-        var value = (asQuery && pair.length > 1) ? pair.join(delimit2) : pair[0];
-        o[key] = value;
-      }
-    }
-
-    return o;
-  }
-
-  // Round x to d significant digits
-  function sig(x, d) {
-    var exp = Math.ceil(Math.log(Math.abs(x))/Math.log(10)),
-        f = Math.pow(10, exp-d);
-    return Math.round(x/f)*f;
-  }
-
-  // Convert x to a readable string version
-  function humanize(x, sd) {
-    var ax = Math.abs(x), res;
-    sd = sd | 4;  // significant digits
-    if (ax == Infinity) {
-      res = ax > 0 ? 'Infinity' : '-Infinity';
-    } else if (ax > 1e9) {
-      res = sig(x/1e9, sd) + 'G';
-    } else if (ax > 1e6) {
-      res = sig(x/1e6, sd) + 'M';
-    } else if (ax > 1e3) {
-      res = sig(x/1e3, sd) + 'k';
-    } else if (ax > .01) {
-      res = sig(x, sd);
-    } else if (ax > 1e-3) {
-      res = sig(x/1e-3, sd) + 'm';
-    } else if (ax > 1e-6) {
-      res = sig(x/1e-6, sd) + '\u00b5'; // Greek mu
-    } else if (ax > 1e-9) {
-      res = sig(x/1e-9, sd) + 'n';
-    } else {
-      res = x ? sig(x, sd) : 0;
-    }
-    // Turn values like "1.1000000000005" -> "1.1"
-    res = (res + '').replace(/0{5,}\d*/, '');
-
-    return res;
-  }
-
-  // Node.js-inspired event emitter API, with some enhancements.
-  function EventEmitter() {
-    var ee = this;
-    var listeners = {};
-    extend(ee, {
-      on: function(e, f) {
-        if (!listeners[e]) listeners[e] = [];
-        listeners[e].push(f);
-      },
-      removeListener: function(e, f) {
-        listeners[e] = filter(listeners[e], function(l) {
-          return l != f;
-        });
-      },
-      removeAllListeners: function(e) {
-        listeners[e] = [];
-      },
-      emit: function(e) {
-        var args = Array.prototype.slice.call(arguments, 1);
-        forEach([].concat(listeners[e], listeners['*']), function(l) {
-          ee._emitting = e;
-          if (l) l.apply(ee, args);
-        });
-        delete ee._emitting;
-      }
-    });
-  }
-
-  //
-  // Test class
-  //
-
-  /**
-   * Test manages a single test (created with JSLitmus.test())
-   */
-  function Test(name, f) {
-    var test = this;
-
-    // Test instances get EventEmitter API
-    EventEmitter.call(test);
-
-    if (!f) throw new Error('Undefined test function');
-    if (!/function[^\(]*\(([^,\)]*)/.test(f)) {
-      throw new Error('"' + name + '" test: Invalid test function');
-    }
-
-    // If the test function takes an argument, we assume it does the iteration
-    // for us
-    var isLoop = !!RegExp.$1;
-
-    /**
-     * Reset test state
-     */
-    function reset() {
-      delete test.count;
-      delete test.time;
-      delete test.running;
-      test.emit('reset', test);
-      return test;
-    }
-
-    function clone() {
-      var test = extend(new Test(name, f), test);
-      return test.reset();
-    }
-
-    /**
-     * Run the test n times, and use the best results
-     */
-    function bestOf(n) {
-      var best = null;
-      while (n--) {
-        var t = clone();
-        t.run(null, true);
-        if (!best || t.period < best.period) {
-          best = t;
-        }
-      }
-      extend(test, best);
-    }
-
-    /**
-     * Start running a test.  Default is to run the test asynchronously (via
-     * setTimeout).  Can be made synchronous by passing true for 2nd param
-     */
-    function run(count, synchronous) {
-      count = count || test.INIT_COUNT;
-      test.running = true;
-
-      if (synchronous) {
-        _run(count, synchronous);
-      } else {
-        setTimeout(function() {
-          _run(count);
-        }, 1);
-      }
-      return test;
-    }
-
-    /**
-     * Run, for real
-     */
-    function _run(count, noTimeout) {
-
-      try {
-        var start, f = test.f, now, i = count;
-
-        // Start the timer
-        start = new Date();
-
-        // Run the test code
-        test.count = count;
-        test.time = 0;
-        test.period = 0;
-
-        test.emit('start', test);
-
-        if (isLoop) {
-          // Test code does it's own iteration
-          f(count);
-        } else {
-          // Do the iteration ourselves
-          while (i--) f();
-        }
-
-        // Get time test took (in secs)
-        test.time = Math.max(1,new Date() - start)/1000;
-
-        // Store iteration count and per-operation time taken
-        test.count = count;
-        test.period = test.time/count;
-
-        // Do we need to keep running?
-        test.running = test.time < test.MIN_TIME;
-
-        // Publish results
-        test.emit('results', test);
-
-        // Set up for another run, if needed
-        if (test.running) {
-          // Use an iteration count that will (we hope) get us close to the
-          // MAX_COUNT time.
-          var x = test.MIN_TIME/test.time;
-          var pow = Math.pow(2, Math.max(1, Math.ceil(Math.log(x)/Math.log(2))));
-          count *= pow;
-          if (count > test.MAX_COUNT) {
-            throw new Error('Max count exceeded.  If this test uses a looping function, make sure the iteration loop is working properly.');
-          }
-
-          if (noTimeout) {
-            _run(count, noTimeout);
-          } else {
-            run(count);
-          }
-        } else {
-          test.emit('complete', test);
-        }
-      } catch (err) {
-        log(err);
-        // Exceptions are caught and displayed in the test UI
-        test.emit('error', err);
-      }
-
-      return test;
-    }
-
-    /**
-    * Get the number of operations per second for this test.
-    *
-    * @param normalize if true, iteration loop overhead taken into account.
-    *                  Note that normalized tests may return Infinity if the
-    *                  test time is of the same order as the calibration time.
-    */
-    function getHz(normalize) {
-      var p = test.period;
-
-      // Adjust period based on the calibration test time
-      if (normalize) {
-        var cal = test.isLoop ? Test.LOOP_CAL : Test.NOLOOP_CAL;
-        if (!cal.period) {
-          // Run calibration if needed
-          cal.MIN_TIME = .3;
-          cal.bestOf(3);
-        }
-
-        // Subtract off calibration time.  In theory this should never be
-        // negative, but in practice the calibration times are affected by a
-        // variety of factors so just clip to zero and let users test for
-        // getHz() == Infinity
-        p = Math.max(0, p - cal.period);
-      }
-
-      return sig(1/p, 4);
-    }
-
-    // Set properties that are specific to this instance
-    extend(test, {
-      // Test name
-      name: name,
-
-      // Test function
-      f: f,
-
-      // True if the test function does it's own looping (i.e. takes an arg)
-      isLoop: isLoop,
-
-      clone: clone,
-      run: run,
-      bestOf: bestOf,
-      getHz: getHz,
-      reset: reset
-    });
-
-    // IE7 doesn't do 'toString' or 'toValue' in object enumerations, so set
-    // it explicitely here.
-    test.toString = function() {
-      if (this.time) {
-        return this.name + ', f = '  +
-        humanize(this.getHz()) + 'hz (' +
-        humanize(this.count) + '/' + humanize(this.time) + 'secs)';
-      } else {
-        return this.name + ', count = '  + humanize(this.count);
-      }
-    };
-  };
-
-  // Set static properties
-  extend(Test, {
-    LOOP_CAL: new Test('loop cal', function(count) {while (count--) {}}),
-    NOLOOP_CAL: new Test('noloop cal', nilf)
-  });
-
-  // Set default property values
-  extend(Test.prototype, {
-    // Initial number of iterations
-    INIT_COUNT: 10,
-
-    // Max iterations allowed (used to detect bad looping functions)
-    MAX_COUNT: 1e9,
-
-    // Minimum time test should take to get valid results (secs)
-    MIN_TIME: 1.0
-  });
-
-  //
-  // jslitmus
-  //
-
-  // Set up jslitmus context
-  var jslitmus;
-  if (platform.name == 'node') {
-    jslitmus = exports;
-  } else {
-    jslitmus = root.jslitmus = {};
-  }
-
-  var tests = [], // test store (all tests added w/ jslitmus.test())
-      queue = [], // test queue (to be run)
-      currentTest; // currently running test
-
-  // jslitmus gets EventEmitter API
-  EventEmitter.call(jslitmus);
-
-  /**
-    * Create a new test
-    */
-  function test(name, f) {
-    // Create the Test object
-    var test = new Test(name, f);
-    tests.push(test);
-
-    // Run the next test if this one finished
-    test.on('*', function() {
-      // Forward test events to jslitmus listeners
-      var args = Array.prototype.slice.call(arguments);
-      args.unshift(test._emitting);
-      jslitmus.emit.apply(jslitmus, args);
-
-      // Auto-run the next test
-      if (test._emitting == 'complete') {
-        currentTest = null;
-        _nextTest();
-      }
-    });
-
-    jslitmus.emit('added', test);
-
-    return test;
-  }
-
-  /**
-    * Add all tests to the run queue
-    */
-  function runAll(e) {
-    forEach(tests, _queueTest);
-  }
-
-  /**
-    * Remove all tests from the run queue.  The current test has to finish on
-    * it's own though
-    */
-  function stop() {
-    while (queue.length) {
-      var test = queue.shift();
-    }
-  }
-
-  /**
-    * Run the next test in the run queue
-    */
-  function _nextTest() {
-    if (!currentTest) {
-      var test = queue.shift();
-      if (test) {
-        currentTest = test;
-        test.run();
-      } else {
-        jslitmus.emit('all_complete');
-      }
-    }
-  }
-
-  /**
-    * Add a test to the run queue
-    */
-  function _queueTest(test) {
-    if (indexOf(queue, test) >= 0) return;
-    queue.push(test);
-    _nextTest();
-  }
-
-  function clearAll() {
-	tests = [];
-  }
-
-  /**
-    * Generate a Google Chart URL that shows the data for all tests
-    */
-  function getGoogleChart(normalize) {
-    var chart_title = [
-      'Operations/second on ' + platform.name,
-      '(' + platform.version + ' / ' + platform.os + ')'
-    ];
-
-    var n = tests.length, markers = [], data = [];
-    var d, min = 0, max = -1e10;
-
-    // Gather test data
-
-    var markers = map(tests, function(test, i) {
-      if (test.count) {
-        var hz = test.getHz();
-        var v = hz != Infinity ? hz : 0;
-        data.push(v);
-        var label = test.name + '(' + humanize(hz)+ ')';
-        var marker = 't' + escape2(label) + ',000000,0,' + i + ',10';
-        max = Math.max(v, max);
-
-        return marker;
-      }
-    });
-
-    if (markers.length <= 0) return null;
-
-    // Build labels
-    var labels = [humanize(min), humanize(max)];
-
-    var w = 250, bw = 15;
-    var bs = 5;
-    var h = markers.length*(bw + bs) + 30 + chart_title.length*20;
-
-    var params = {
-      chtt: escape(chart_title.join('|')),
-      chts: '000000,10',
-      cht: 'bhg',                     // chart type
-      chd: 't:' + data.join(','),     // data set
-      chds: min + ',' + max,          // max/min of data
-      chxt: 'x',                      // label axes
-      chxl: '0:|' + labels.join('|'), // labels
-      chsp: '0,1',
-      chm: markers.join('|'),         // test names
-      chbh: [bw, 0, bs].join(','),    // bar widths
-      // chf: 'bg,lg,0,eeeeee,0,eeeeee,.5,ffffff,1', // gradient
-      chs: w + 'x' + h
-    };
-
-    var url = 'http://chart.apis.google.com/chart?' + join(params);
-
-    return url;
-  }
-
-  // Public API
-  extend(jslitmus, {
-    Test: Test,
-    platform: platform,
-    test: test,
-    runAll: runAll,
-    getGoogleChart: getGoogleChart,
-	clearAll: clearAll
-  });
-
-  // Expose code goodness we've got here, since it's useful, but do so in a way
-  // that doesn't commit us to supporting it in future versions.
-  jslitmus.unsupported = {
-    nilf: nilf,
-    log: log,
-    extend: extend,
-    forEach: forEach,
-    filter: filter,
-    map: map,
-    indexOf: indexOf,
-    escape2: escape2,
-    join: join,
-    split: split,
-    sig: sig,
-    humanize: humanize
-  };
-})();

static/static/lib/doT-1.1.3/benchmarks/templatesBench.js

@@ -1,138 +0,0 @@
-(function() {
-	var jslitmus, _, doU, doT,
-		data = { f1: 1, f2: 2, f3: 3, f4: "http://bebedo.com/laura"},
-		snippet = "<h1>Just static text</h1>\
-		<p>Here is a simple {{=it.f1}} </p>\
-		<div>test {{=it.f2}}\
-		<div>{{=it.f3}}</div>\
-		<div>{{!it.f4}}</div>\
-		</div>";
-
-	if (typeof module !== 'undefined' && module.exports) {
-		runTests();
-	} else {
-		window.onload = runTestsInBrowser;
-	}
-
-	function testsetup(snippet) {
-		// doU with 'it'
-		var doUCompiled = doU.template(snippet);
-		// doT with 'it'
-		var doTCompiledParam = doT.template(snippet);
-		// doT with 'this'
-		var doTCompiled = doT.template(snippet.replace(/=it\./g, '=this.').replace(/{{!it\./g, '{{!this.'));
-		// doT with 'it' and append = false
-		doT.templateSettings.append = false;
-		var doTCompiledNoAppend = doT.template(snippet);
-
-		jslitmus.test('doU.js', function() {
-			doUCompiled(data);
-		});
-
-		jslitmus.test('doU.js - looping', function(count) {
-			while (count--) {
-				doUCompiled(data);
-			}
-		});
-
-		jslitmus.test('doT.js - using this', function() {
-			doTCompiled.call(data);
-		});
-
-		jslitmus.test('doT.js - using this - looping', function(count) {
-			while (count--) {
-				doTCompiled.call(data);
-			}
-		});
-
-		jslitmus.test('doT.js - using it', function() {
-			doTCompiledParam(data);
-		});
-
-		jslitmus.test('doT.js - using it - looping', function(count) {
-			while (count--) {
-				doTCompiledParam(data);
-			}
-		});
-
-		jslitmus.test('doT.js - append off', function() {
-			doTCompiledNoAppend(data);
-		});
-
-		jslitmus.test('doT.js - append off - looping', function(count) {
-			while (count--) {
-				doTCompiledNoAppend(data);
-			}
-		});
-}
-
-	function runTests() {
-		//var util = require('util');
-		jslitmus = require('./jslitmus.js');
-		doU = require('./templating/doU.js');
-		doT = require('./templating/doT.js');
-		var passOne = 0;
-		console.log("*** Small template length: " + snippet.length);
-		testsetup(snippet);
-		// Log the test results
-		jslitmus.on('complete', function(test) {
-			//console.log(util.inspect(process.memoryUsage()));
-			console.log(test.toString());
-		});
-		// 'all_complete' fires when all tests have finished.
-		jslitmus.on('all_complete', function() {
-			switch (passOne) {
-			case 0:
-				passOne++;
-				for(var i=0; i<5; i++) { snippet += snippet; }
-				console.log("*** Medium template length: " + snippet.length);
-				break;
-			case 1:
-				passOne++;
-				for(var i=0; i<3; i++) { snippet += snippet; }
-				console.log("*** Large template length: " + snippet.length);
-				break;
-			default:
-				return;
-			}
-
-			jslitmus.clearAll();
-			testsetup(snippet);
-			jslitmus.runAll();
-		});
-		// Run it!
-		jslitmus.runAll();
-	}
-
-	function runTestsInBrowser() {
-		jslitmus = window.jslitmus;doU = window.doU;doT = window.doT;
-
-		var resultTmpl = doT.template("<h3>Template length : {{=it.size}} </h3>	<img src='{{=it.url}}'/>");
-		var currentSet = document.getElementById('small');
-		testsetup(snippet);
-		// 'complete' fires for each test when it finishes.
-		jslitmus.on('complete', function(test) {
-		// Output test results
-			currentSet.innerHTML += test + '<br/>';
-		});
-		// 'all_complete' fires when all tests have finished.
-		jslitmus.on('all_complete', function() {
-			// Get the results image URL
-			var url = jslitmus.getGoogleChart();
-			if (currentSet.id === 'small') {
-				currentSet.innerHTML += resultTmpl({size: snippet.length, url: url});
-				setTimeout(function() {
-					jslitmus.clearAll();
-					currentSet = document.getElementById('large');
-					for(var i=0; i<8; i++) { snippet += snippet; }
-					testsetup(snippet);
-					jslitmus.runAll();
-				}, 10);
-			} else {
-				currentSet.innerHTML += resultTmpl({size: snippet.length, url: url});
-			}
-		});
-		// Run it!
-		jslitmus.runAll();
-	}
-})();

static/static/lib/doT-1.1.3/benchmarks/templating/doT.js

@@ -1,140 +0,0 @@
-// doT.js
-// 2011-2014, Laura Doktorova, https://github.com/olado/doT
-// Licensed under the MIT license.
-
-(function() {
-	"use strict";
-
-	var doT = {
-		version: "1.0.3",
-		templateSettings: {
-			evaluate:    /\{\{([\s\S]+?(\}?)+)\}\}/g,
-			interpolate: /\{\{=([\s\S]+?)\}\}/g,
-			encode:      /\{\{!([\s\S]+?)\}\}/g,
-			use:         /\{\{#([\s\S]+?)\}\}/g,
-			useParams:   /(^|[^\w$])def(?:\.|\[[\'\"])([\w$\.]+)(?:[\'\"]\])?\s*\:\s*([\w$\.]+|\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})/g,
-			define:      /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,
-			defineParams:/^\s*([\w$]+):([\s\S]+)/,
-			conditional: /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g,
-			iterate:     /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g,
-			varname:	"it",
-			strip:		true,
-			append:		true,
-			selfcontained: false,
-			doNotSkipEncoded: false
-		},
-		template: undefined, //fn, compile template
-		compile:  undefined  //fn, for express
-	}, _globals;
-
-	doT.encodeHTMLSource = function(doNotSkipEncoded) {
-		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': "&#34;", "'": "&#39;", "/": "&#47;" },
-			matchHTML = doNotSkipEncoded ? /[&<>"'\/]/g : /&(?!#?\w+;)|<|>|"|'|\//g;
-		return function(code) {
-			return code ? code.toString().replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : "";
-		};
-	};
-
-	_globals = (function(){ return this || (0,eval)("this"); }());
-
-	if (typeof module !== "undefined" && module.exports) {
-		module.exports = doT;
-	} else if (typeof define === "function" && define.amd) {
-		define(function(){return doT;});
-	} else {
-		_globals.doT = doT;
-	}
-
-	var startend = {
-		append: { start: "'+(",      end: ")+'",      startencode: "'+encodeHTML(" },
-		split:  { start: "';out+=(", end: ");out+='", startencode: "';out+=encodeHTML(" }
-	}, skip = /$^/;
-
-	function resolveDefs(c, block, def) {
-		return ((typeof block === "string") ? block : block.toString())
-		.replace(c.define || skip, function(m, code, assign, value) {
-			if (code.indexOf("def.") === 0) {
-				code = code.substring(4);
-			}
-			if (!(code in def)) {
-				if (assign === ":") {
-					if (c.defineParams) value.replace(c.defineParams, function(m, param, v) {
-						def[code] = {arg: param, text: v};
-					});
-					if (!(code in def)) def[code]= value;
-				} else {
-					new Function("def", "def['"+code+"']=" + value)(def);
-				}
-			}
-			return "";
-		})
-		.replace(c.use || skip, function(m, code) {
-			if (c.useParams) code = code.replace(c.useParams, function(m, s, d, param) {
-				if (def[d] && def[d].arg && param) {
-					var rw = (d+":"+param).replace(/'|\\/g, "_");
-					def.__exp = def.__exp || {};
-					def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2");
-					return s + "def.__exp['"+rw+"']";
-				}
-			});
-			var v = new Function("def", "return " + code)(def);
-			return v ? resolveDefs(c, v, def) : v;
-		});
-	}
-
-	function unescape(code) {
-		return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, " ");
-	}
-
-	doT.template = function(tmpl, c, def) {
-		c = c || doT.templateSettings;
-		var cse = c.append ? startend.append : startend.split, needhtmlencode, sid = 0, indv,
-			str  = (c.use || c.define) ? resolveDefs(c, tmpl, def || {}) : tmpl;
-
-		str = ("var out='" + (c.strip ? str.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g," ")
-					.replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,""): str)
-			.replace(/'|\\/g, "\\$&")
-			.replace(c.interpolate || skip, function(m, code) {
-				return cse.start + unescape(code) + cse.end;
-			})
-			.replace(c.encode || skip, function(m, code) {
-				needhtmlencode = true;
-				return cse.startencode + unescape(code) + cse.end;
-			})
-			.replace(c.conditional || skip, function(m, elsecase, code) {
-				return elsecase ?
-					(code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='") :
-					(code ? "';if(" + unescape(code) + "){out+='" : "';}out+='");
-			})
-			.replace(c.iterate || skip, function(m, iterate, vname, iname) {
-				if (!iterate) return "';} } out+='";
-				sid+=1; indv=iname || "i"+sid; iterate=unescape(iterate);
-				return "';var arr"+sid+"="+iterate+";if(arr"+sid+"){var "+vname+","+indv+"=-1,l"+sid+"=arr"+sid+".length-1;while("+indv+"<l"+sid+"){"
-					+vname+"=arr"+sid+"["+indv+"+=1];out+='";
-			})
-			.replace(c.evaluate || skip, function(m, code) {
-				return "';" + unescape(code) + "out+='";
-			})
-			+ "';return out;")
-			.replace(/\n/g, "\\n").replace(/\t/g, '\\t').replace(/\r/g, "\\r")
-			.replace(/(\s|;|\}|^|\{)out\+='';/g, '$1').replace(/\+''/g, "");
-			//.replace(/(\s|;|\}|^|\{)out\+=''\+/g,'$1out+=');
-
-		if (needhtmlencode) {
-			if (!c.selfcontained && _globals && !_globals._encodeHTML) _globals._encodeHTML = doT.encodeHTMLSource(c.doNotSkipEncoded);
-			str = "var encodeHTML = typeof _encodeHTML !== 'undefined' ? _encodeHTML : ("
-				+ doT.encodeHTMLSource.toString() + "(" + (c.doNotSkipEncoded || '') + "));"
-				+ str;
-		}
-		try {
-			return new Function(c.varname, str);
-		} catch (e) {
-			if (typeof console !== "undefined") console.log("Could not create a template function: " + str);
-			throw e;
-		}
-	};
-
-	doT.compile = function(tmpl, def) {
-		return doT.template(tmpl, null, def);
-	};
-}());

static/static/lib/doT-1.1.3/benchmarks/templating/doU.js

@@ -1,56 +0,0 @@
-// doU.js
-// (c) 2011, Laura Doktorova
-// https://github.com/olado/doT
-//
-// doU is an extraction and slight modification of an excellent
-// templating function from jQote2.js (jQuery plugin) by aefxx
-// (http://aefxx.com/jquery-plugins/jqote2/).
-//
-// Modifications:
-// 1. nodejs support
-// 2. allow for custom template markers
-// 3. only allow direct invocation of the compiled function
-//
-// Licensed under the MIT license.
-
-(function() {
-	var doU = { version : '0.1.2' };
-
-	if (typeof module !== 'undefined' && module.exports) {
-		module.exports = doU;
-	} else {
-		this.doU = doU;
-	}
-
-	doU.templateSettings = {
-		begin : '{{',
-		end : '}}',
-		varname : 'it'
-	};
-
-	doU.template = function(tmpl, conf) {
-		conf = conf || doU.templateSettings;
-		var str = '', tb = conf.begin, te = conf.end, m, l,
-			arr = tmpl.replace(/\s*<!\[CDATA\[\s*|\s*\]\]>\s*|[\r\n\t]|(\/\*[\s\S]*?\*\/)/g, '')
-				.split(tb).join(te +'\x1b')
-				.split(te);
-
-		for (m=0,l=arr.length; m < l; m++) {
-			str += arr[m].charAt(0) !== '\x1b' ?
-			"out+='" + arr[m].replace(/(\\|["'])/g, '\\$1') + "'" : (arr[m].charAt(1) === '=' ?
-			';out+=(' + arr[m].substr(2) + ');' : (arr[m].charAt(1) === '!' ?
-			';out+=(' + arr[m].substr(2) + ").toString().replace(/&(?!\\w+;)/g, '&#38;').split('<').join('&#60;').split('>').join('&#62;').split('" + '"' + "').join('&#34;').split(" + '"' + "'" + '"' + ").join('&#39;').split('/').join('&#x2F;');" : ';' + arr[m].substr(1)));
-		}
-
-		str = ('var out="";'+str+';return out;')
-			.split("out+='';").join('')
-			.split('var out="";out+=').join('var out=');
-
-		try {
-			return new Function(conf.varname, str);
-		} catch (e) {
-			if (typeof console !== 'undefined') console.log("Could not create a template function: " + str);
-			throw e;
-		}
-	};
-}());

static/static/lib/doT-1.1.3/bin/dot-packer

@@ -1,52 +0,0 @@
-#!/usr/bin/env node
-/* Continuation of https://github.com/Katahdin/dot-packer */
-
-var program = require('commander'),
-	dot = require('../');
-
-program
-	.version('0.0.1')
-	.usage('dottojs')
-	.option('-s, --source [value]', 'source folder/file path')
-	.option('-d, --dest [value]', 'destination folder')
-	.option('-g, --global [value]', 'the global variable to install the templates in',"window.render")
-	.option('-p, --package [value]', 'if specified, package all templates from destination folder into specified file')
-	.parse(process.argv);
-
-if (program.dest) mkdirordie(program.dest);
-if (program.package) {
-	var li = program.package.lastIndexOf('/');
-	if (li>0) mkdirordie(program.package.substring(0, li));
-}
-
-function mkdirordie(path) {
-	require("mkdirp")(path, function (err) {
-    	if (err) {
-    		console.error(err);
-    		process.exit(1);
-    	}
-	});
-}
-
-var render = dot.process({
-		path: program.source,
-		destination: program.dest,
-		global: program.global
-	});
-
-if (program.package) {
-	console.log("Packaging all files into " + program.package);
-	var fs = require("fs");
-	var files = [];
-	var dest = program.dest || './';
-	if (dest[dest.length-1] !== '/') dest += '/';
-	var sources = fs.readdirSync(dest);
-	for(k = 0; k < sources.length; k++) {
-		name = sources[k];
-		if (/\.js$/.test(name)) {
-			files.push(dest + name);
-		}
-	}
-	var result = require("uglify-js").minify(files);
-	fs.writeFileSync(program.package, result.code);
-}

static/static/lib/doT-1.1.3/bower.json

@@ -1,21 +0,0 @@
-{
-  "name": "dot",
-  "description": "Concise and fast javascript templating compatible with nodejs and other javascript environments",
-  "main": "doT.js",
-  "authors": [
-    "Laura Doktorova <ldoktorova@gmail.com>"
-  ],
-  "license": "MIT",
-  "keywords": [
-    "template",
-    "fast",
-    "simple",
-    "templating"
-  ],
-  "homepage": "https://github.com/olado/doT",
-  "ignore": [
-    "node_modules",
-    "bower_components",
-    "test"
-  ]
-}

static/static/lib/doT-1.1.3/doT.js

@@ -1,144 +0,0 @@
-// doT.js
-// 2011-2014, Laura Doktorova, https://github.com/olado/doT
-// Licensed under the MIT license.
-
-(function () {
-	"use strict";
-
-	var doT = {
-		name: "doT",
-		version: "1.1.1",
-		templateSettings: {
-			evaluate:    /\{\{([\s\S]+?(\}?)+)\}\}/g,
-			interpolate: /\{\{=([\s\S]+?)\}\}/g,
-			encode:      /\{\{!([\s\S]+?)\}\}/g,
-			use:         /\{\{#([\s\S]+?)\}\}/g,
-			useParams:   /(^|[^\w$])def(?:\.|\[[\'\"])([\w$\.]+)(?:[\'\"]\])?\s*\:\s*([\w$\.]+|\"[^\"]+\"|\'[^\']+\'|\{[^\}]+\})/g,
-			define:      /\{\{##\s*([\w\.$]+)\s*(\:|=)([\s\S]+?)#\}\}/g,
-			defineParams:/^\s*([\w$]+):([\s\S]+)/,
-			conditional: /\{\{\?(\?)?\s*([\s\S]*?)\s*\}\}/g,
-			iterate:     /\{\{~\s*(?:\}\}|([\s\S]+?)\s*\:\s*([\w$]+)\s*(?:\:\s*([\w$]+))?\s*\}\})/g,
-			varname:	"it",
-			strip:		true,
-			append:		true,
-			selfcontained: false,
-			doNotSkipEncoded: false
-		},
-		template: undefined, //fn, compile template
-		compile:  undefined, //fn, for express
-		log: true
-	}, _globals;
-
-	doT.encodeHTMLSource = function(doNotSkipEncoded) {
-		var encodeHTMLRules = { "&": "&#38;", "<": "&#60;", ">": "&#62;", '"': "&#34;", "'": "&#39;", "/": "&#47;" },
-			matchHTML = doNotSkipEncoded ? /[&<>"'\/]/g : /&(?!#?\w+;)|<|>|"|'|\//g;
-		return function(code) {
-			return code ? code.toString().replace(matchHTML, function(m) {return encodeHTMLRules[m] || m;}) : "";
-		};
-	};
-
-	_globals = (function(){ return this || (0,eval)("this"); }());
-
-	/* istanbul ignore else */
-	if (typeof module !== "undefined" && module.exports) {
-		module.exports = doT;
-	} else if (typeof define === "function" && define.amd) {
-		define(function(){return doT;});
-	} else {
-		_globals.doT = doT;
-	}
-
-	var startend = {
-		append: { start: "'+(",      end: ")+'",      startencode: "'+encodeHTML(" },
-		split:  { start: "';out+=(", end: ");out+='", startencode: "';out+=encodeHTML(" }
-	}, skip = /$^/;
-
-	function resolveDefs(c, block, def) {
-		return ((typeof block === "string") ? block : block.toString())
-		.replace(c.define || skip, function(m, code, assign, value) {
-			if (code.indexOf("def.") === 0) {
-				code = code.substring(4);
-			}
-			if (!(code in def)) {
-				if (assign === ":") {
-					if (c.defineParams) value.replace(c.defineParams, function(m, param, v) {
-						def[code] = {arg: param, text: v};
-					});
-					if (!(code in def)) def[code]= value;
-				} else {
-					new Function("def", "def['"+code+"']=" + value)(def);
-				}
-			}
-			return "";
-		})
-		.replace(c.use || skip, function(m, code) {
-			if (c.useParams) code = code.replace(c.useParams, function(m, s, d, param) {
-				if (def[d] && def[d].arg && param) {
-					var rw = (d+":"+param).replace(/'|\\/g, "_");
-					def.__exp = def.__exp || {};
-					def.__exp[rw] = def[d].text.replace(new RegExp("(^|[^\\w$])" + def[d].arg + "([^\\w$])", "g"), "$1" + param + "$2");
-					return s + "def.__exp['"+rw+"']";
-				}
-			});
-			var v = new Function("def", "return " + code)(def);
-			return v ? resolveDefs(c, v, def) : v;
-		});
-	}
-
-	function unescape(code) {
-		return code.replace(/\\('|\\)/g, "$1").replace(/[\r\t\n]/g, " ");
-	}
-
-	doT.template = function(tmpl, c, def) {
-		c = c || doT.templateSettings;
-		var cse = c.append ? startend.append : startend.split, needhtmlencode, sid = 0, indv,
-			str  = (c.use || c.define) ? resolveDefs(c, tmpl, def || {}) : tmpl;
-
-		str = ("var out='" + (c.strip ? str.replace(/(^|\r|\n)\t* +| +\t*(\r|\n|$)/g," ")
-					.replace(/\r|\n|\t|\/\*[\s\S]*?\*\//g,""): str)
-			.replace(/'|\\/g, "\\$&")
-			.replace(c.interpolate || skip, function(m, code) {
-				return cse.start + unescape(code) + cse.end;
-			})
-			.replace(c.encode || skip, function(m, code) {
-				needhtmlencode = true;
-				return cse.startencode + unescape(code) + cse.end;
-			})
-			.replace(c.conditional || skip, function(m, elsecase, code) {
-				return elsecase ?
-					(code ? "';}else if(" + unescape(code) + "){out+='" : "';}else{out+='") :
-					(code ? "';if(" + unescape(code) + "){out+='" : "';}out+='");
-			})
-			.replace(c.iterate || skip, function(m, iterate, vname, iname) {
-				if (!iterate) return "';} } out+='";
-				sid+=1; indv=iname || "i"+sid; iterate=unescape(iterate);
-				return "';var arr"+sid+"="+iterate+";if(arr"+sid+"){var "+vname+","+indv+"=-1,l"+sid+"=arr"+sid+".length-1;while("+indv+"<l"+sid+"){"
-					+vname+"=arr"+sid+"["+indv+"+=1];out+='";
-			})
-			.replace(c.evaluate || skip, function(m, code) {
-				return "';" + unescape(code) + "out+='";
-			})
-			+ "';return out;")
-			.replace(/\n/g, "\\n").replace(/\t/g, '\\t').replace(/\r/g, "\\r")
-			.replace(/(\s|;|\}|^|\{)out\+='';/g, '$1').replace(/\+''/g, "");
-			//.replace(/(\s|;|\}|^|\{)out\+=''\+/g,'$1out+=');
-
-		if (needhtmlencode) {
-			if (!c.selfcontained && _globals && !_globals._encodeHTML) _globals._encodeHTML = doT.encodeHTMLSource(c.doNotSkipEncoded);
-			str = "var encodeHTML = typeof _encodeHTML !== 'undefined' ? _encodeHTML : ("
-				+ doT.encodeHTMLSource.toString() + "(" + (c.doNotSkipEncoded || '') + "));"
-				+ str;
-		}
-		try {
-			return new Function(c.varname, str);
-		} catch (e) {
-			/* istanbul ignore else */
-			if (typeof console !== "undefined") console.log("Could not create a template function: " + str);
-			throw e;
-		}
-	};
-
-	doT.compile = function(tmpl, def) {
-		return doT.template(tmpl, null, def);
-	};
-}());

static/static/lib/doT-1.1.3/doU.js

@@ -1,56 +0,0 @@
-// doU.js
-// (c) 2011, Laura Doktorova
-// https://github.com/olado/doT
-//
-// doU is an extraction and slight modification of an excellent
-// templating function from jQote2.js (jQuery plugin) by aefxx
-// (http://aefxx.com/jquery-plugins/jqote2/).
-//
-// Modifications:
-// 1. nodejs support
-// 2. allow for custom template markers
-// 3. only allow direct invocation of the compiled function
-//
-// Licensed under the MIT license.
-
-(function() {
-	var doU = { version : '0.1.2' };
-
-	if (typeof module !== 'undefined' && module.exports) {
-		module.exports = doU;
-	} else {
-		this.doU = doU;
-	}
-
-	doU.templateSettings = {
-		begin : '{{',
-		end : '}}',
-		varname : 'it'
-	};
-
-	doU.template = function(tmpl, conf) {
-		conf = conf || doU.templateSettings;
-		var str = '', tb = conf.begin, te = conf.end, m, l,
-			arr = tmpl.replace(/\s*<!\[CDATA\[\s*|\s*\]\]>\s*|[\r\n\t]|(\/\*[\s\S]*?\*\/)/g, '')
-				.split(tb).join(te +'\x1b')
-				.split(te);
-
-		for (m=0,l=arr.length; m < l; m++) {
-			str += arr[m].charAt(0) !== '\x1b' ?
-			"out+='" + arr[m].replace(/(\\|["'])/g, '\\$1') + "'" : (arr[m].charAt(1) === '=' ?
-			';out+=(' + arr[m].substr(2) + ');' : (arr[m].charAt(1) === '!' ?
-			';out+=(' + arr[m].substr(2) + ").toString().replace(/&(?!\\w+;)/g, '&#38;').split('<').join('&#60;').split('>').join('&#62;').split('" + '"' + "').join('&#34;').split(" + '"' + "'" + '"' + ").join('&#39;').split('/').join('&#x2F;');" : ';' + arr[m].substr(1)));
-		}
-
-		str = ('var out="";'+str+';return out;')
-			.split("out+='';").join('')
-			.split('var out="";out+=').join('var out=');
-
-		try {
-			return new Function(conf.varname, str);
-		} catch (e) {
-			if (typeof console !== 'undefined') console.log("Could not create a template function: " + str);
-			throw e;
-		}
-	};
-}());

static/static/lib/doT-1.1.3/examples/advancedsnippet.txt

@@ -1,135 +0,0 @@
-Advanced templating: illustrates defines and includes.
-
-Include external snippet defined in a variable:
-{{#def.externalsnippet}}
-
-Load external template from a file:
-{{#def.loadfile('/snippet.txt')}}
-
-Load external template from a file and cache in a variable:
-{{#def['snippet.txt'] || (def['snippet.txt'] = def.loadfile('/snippet.txt'))}}
-
-Use cached file again:
-{{#def['snippet.txt']}}
-
-Here is a def block that will be used later. This snippet can be referenced from external templates too:
-{{##def.snippet1:
-	Some snippet that will be included {{#def.a}} later {{=it.f1}}
-#}}
-
-First use of snippet1:
-{{#def.snippet1}}
-
-Second use of snippet1:
-{{#def.snippet1}}
-
-Include snippet1 if true:
-{{# true && def.snippet1 }}
-
-Runtime and Compile time evaluation used together:
-{{= it.f3 + {{#def.a + def.b}} }}
-
-Include xyz or insert 'not found':
-{{#def.xyz || 'not found'}}
-
-Set xyz to 1 and exclude result from output:
-{{##def.xyz=1#}} is identical to {{#(def.xyz=1) && ""}}
-
-Compare xyz to 1, show 'xyz is not 1' if false:
-{{#def.xyz === 1 || 'xyz is not 1'}}
-
-{{ if ({{#!def.abc}}) { }}
-	{{#def.abc}} is falsy
-{{ } }}
-
-{{ if ({{#def.xyz === 1}}) { }}
-	if(true) block
-{{ } }}
-
-{{##def.fntest = function() {
-	return "Function test worked!";
-}
-#}}
-
-{{#def.fntest()}}
-
-Conditionals:
-{{? !it.altEmail }}
-	<p>
-	second email: {{= it.altEmail }}
-	</p>
-{{?? true }}
-	else case worked
-{{?}}
-
-Array iterators
-{{~ it.farray :p }}
-	<h1>{{=p.farray}}<h1>
-	{{~ p.farray :value:i }}
-		<h2>{{=i}}: {{=value}}</h2>
-		{{~ value :w }}
-			<h3>{{=w}}</h3>
-		{{~}}
-	{{~}}
-{{~}}
-
-{{~ ["apple", "banana", "orange"] :k}}
-	{{=k}}
-{{~}}
-
-{{~ (function(){ return [1,2,3]})() :k}}
-	{{=k}}
-{{~}}
-
-{{ function children(it) { }}
-
-{{?it.Nodes.length}}
-<ul>
-    {{~ it.Nodes :p}}
-    <li>
-        {{=p.title}}
-		{{children(p);}}
-    </li>
-    {{~}}
-</ul>
-{{?}}
-
-{{ } }}
-
-{{ children( {Nodes:[ {title:"1.1", Nodes:[ {title:"1.1.1", Nodes:[]}, {title:"1.1.2", Nodes:[]}] }, { title:"1.2", Nodes:[]}, { title:"1.3", Nodes:[]}], title:"1" } ); }}
-
-
-{{##def.block:param:
-	<div>{{=param}}</div>
-#}}
-
-{{##def.block1:param:
-	<div>{{=param.a}}</div>
-#}}
-
-
-{{#(def.block:'text' || '') + def.block:5}}
-
-{{#def.block:it.f3 || ''}}
-
-{{#def.block:"lala tralala" || ''}}
-
-{{#def.block1:{a:1, b:2} || ''}}
-
-{{##def.testFunctionWithParam = function(str) {
-		return "My name is: " + str;
-	}
-#}}
-
-{{##def.mytestparam: {{=it.name}} #}}
-{{#def.testFunctionWithParam(def.mytestparam)}}
-
-{{#def.testFunctionWithParam("\{\{=it.name\}\}")}}
-
-{{##def.testParamDef:myparam:
-My name is: {{=myparam}}
-#}}
-
-{{#def.testParamDef:it.name}}
-
-The end

static/static/lib/doT-1.1.3/examples/browsersample.html

@@ -1,54 +0,0 @@
-<html>
-	<head>
-
-	<script id="headertmpl" type="text/x-dot-template">
-		<h1>{{=it.title}}</h1>
-	</script>
-
-	<script id="pagetmpl" type="text/x-dot-template">
-		<h2>Here is the page using a header template</h2>
-		{{#def.header}}
-		{{=it.name}}
-	</script>
-
-	<script id="customizableheadertmpl" type="text/x-dot-template">
-		 {{#def.header}}
-		 {{#def.mycustominjectionintoheader || ''}}
-	 </script>
-
-	<script id="pagetmplwithcustomizableheader" type="text/x-dot-template">
-		<h2>Here is the page with customized header template</h2>
-		{{##def.mycustominjectionintoheader:
-			<div>{{=it.title}} is not {{=it.name}}</div>
-		#}}
-		{{#def.customheader}}
-		{{=it.name}}
-	</script>
-
-	<script src="../doT.min.js" type="text/javascript"></script>
-	</head>
-
-	<body>
-		<div id="content"></div>
-		<div id="contentcustom"></div>
-	</body>
-
-	<script type="text/javascript">
-		var def = {
-			header: document.getElementById('headertmpl').text,
-			customheader: document.getElementById('customizableheadertmpl').text
-		};
-		var data = {
-			title: "My title",
-			name: "My name"
-		};
-
-		var pagefn = doT.template(document.getElementById('pagetmpl').text, undefined, def);
-		document.getElementById('content').innerHTML = pagefn(data);
-
-		pagefn = doT.template(document.getElementById('pagetmplwithcustomizableheader').text, undefined, def);
-		document.getElementById('contentcustom').innerHTML = pagefn(data);
-
-	</script>
-
-</html>

static/static/lib/doT-1.1.3/examples/customdoT.js

@@ -1,19 +0,0 @@
-(function() {
-	var doT = require('../doT.js'),
-		data = { f1: 1, f2: 2, f3: 3},
-		snippet = '<h1>Just static text</h1> <p>Here is a simple case <?=it.f1+it.f3?> </p> <div class="<?=it.f1?>"> Next we will use a JavaScript block: </div> <? for(var i=0; i < it.f2; i++) { ?>	<div><?=it.f3?></div> <? }; ?>';
-
-	doT.templateSettings = {
-		evaluate : /\<\?([\s\S]+?)\?\>/g,
-		interpolate : /\<\?=([\s\S]+?)\?\>/g,
-		varname     : 'it',
-		strip: true
-	};
-
-
-
-	var doTCompiled = doT.template(snippet);
-
-	console.log("Generated function: \n" + doTCompiled.toString());
-	console.log("Result of calling with " + JSON.stringify(data) + " :\n" + doTCompiled(data));
-}());

static/static/lib/doT-1.1.3/examples/express/index.js

@@ -1 +0,0 @@
-require("./lib/app");

static/static/lib/doT-1.1.3/examples/express/lib/app.js

@@ -1,25 +0,0 @@
-require("dot").process({
-	global: "_page.render"
-	, destination: __dirname + "/render/"
-	, path: (__dirname + "/../templates")
-});
-
-var express = require('express')
-, http = require('http')
-, app = express()
-, render = require('./render')
-;
-
-app.get('/', function(req, res){
-  res.send(render.dashboard({text:"Good morning!"}));
-});
-
-app.use(function(err, req, res, next) {
-	console.error(err.stack);
-	res.status(500).send('Something broke!');
-});
-
-var httpServer = http.createServer(app);
-httpServer.listen(3000, function() {
-	console.log('Listening on port %d', httpServer.address().port);
-});

static/static/lib/doT-1.1.3/examples/express/lib/render/index.js

@@ -1,18 +0,0 @@
-var path = require('path')
-	, fs = require('fs');
-
-function req(name) {
-	var module = require("./" + name);
-	delete exports[name];
-	return exports[name] = module;
-}
-
-fs.readdirSync(__dirname).forEach(function(file) {
-	if ((file === 'index.js') || (file[0] === '_')) { return; }
-	var ext = path.extname(file);
-	var stats = fs.statSync(__dirname + '/' + file);
-	if (stats.isFile() && !(ext in require.extensions)) { return; }
-	var basename = path.basename(file, '.js');
-  	exports.__defineGetter__(basename, function(){ return req(basename); });
-});
-

static/static/lib/doT-1.1.3/examples/express/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "dot-express-example",
-  "description": "doT express example",
-  "version": "0.0.1",
-  "private": true,
-  "dependencies": {
-    "express": "4.x",
-    "dot": "*"
-  }
-}

static/static/lib/doT-1.1.3/examples/express/templates/dashboard.jst

@@ -1,5 +0,0 @@
-{{##def.test:
-	{{=it.text}}
-#}}
-
-{{#def.test}}

static/static/lib/doT-1.1.3/examples/express/templates/login.jst

@@ -1,34 +0,0 @@
-<html>
-  <body>
-	<div>Signin</div>
-    <form action="/login" method="post">
-      <div>
-        <label>Username:</label>
-        <input type="text" name="username" />
-        <br/>
-      </div>
-      <div>
-        <label>Password:</label>
-        <input type="password" name="password" />
-      </div>
-      <div>
-        <input type="submit" value="Sign in" />
-      </div>
-    </form>
-	<div>Signup</div>
-    <form action="/signup" method="post">
-      <div>
-        <label>Username:</label>
-        <input type="text" name="username" />
-        <br/>
-      </div>
-      <div>
-        <label>Password:</label>
-        <input type="password" name="password" />
-      </div>
-      <div>
-        <input type="submit" value="Sign up" />
-      </div>
-    </form>
-   </body>
-</html>

static/static/lib/doT-1.1.3/examples/snippet.txt

@@ -1,13 +0,0 @@
-Core templating
-
-<h1>Just static text</h1>
-<p>Interpolation {{=it.f1	+	it.f3}} </p>
-<div> JavaScript block evaluation
-{{ for(var i=0; i < it.f2; i++) {
-	console.log("Pass\t" + i);
-}}
-<div>{{=it.f3}}</div>
-{{ } }}
-</div>
-<div> Encoding {{!'<a 	href="http://github.com"></a>'}}</div>
-

static/static/lib/doT-1.1.3/examples/views/multidef.def.jst

@@ -1,13 +0,0 @@
-{{##def.template1:
-	<div>{{=it.bar}}</div>
-	/* Including one.def file here */
-	{{#def.one}}
-#}}
-
-{{##def.template2:param:
-	<div>{{=param.bar}}</div>
-	<div class="{{=param.class}}">
-	</div>
-#}}
-
-

static/static/lib/doT-1.1.3/examples/views/one.def

@@ -1,2 +0,0 @@
-/* This file can be inserted into other files */
-<div>{{=it.foo}}</div>

static/static/lib/doT-1.1.3/examples/views/two.dot.jst

@@ -1,17 +0,0 @@
-/* Including multidef file */
-{{#def.multidef}}
-
-<div class="{{=it.class}}">
-	/* Including one.def file */
-	{{#def.one}}
-
-	/* Using sub-define from multidef */
-	{{#def.template2:{bar:"hello", class:"hidden"} }}
-
-	/* Using sub-define from multidef */
-	{{ var data = {bar:"world", class:"visible"}; }}
-	{{#def.template2:data}}
-</div>
-
-
-

static/static/lib/doT-1.1.3/examples/withdoT.js

@@ -1,21 +0,0 @@
-(function() {
-	var doT = require('../doT.js'),
-		fs = require('fs'),
-		data = { name: "Foo", f1: 1, f2: 2, f3: 3, altEmail: "conditional works", farray:[{farray:[1,2,3,[11,22,33]],person:{name:'Ell',age:23}},{farray:{how:'really'}}, {farray:[5,6,7,8]}]},
-		defs = { a: 100, b: 200};
-
-	defs.loadfile = function(path) {
-		return fs.readFileSync(process.argv[1].replace(/\/[^\/]*$/,path));
-	};
-	defs.externalsnippet = defs.loadfile('/snippet.txt');
-
-	fs.readFile(process.argv[1].replace(/\/[^\/]*$/,'/advancedsnippet.txt'), function (err, snippet) {
-		if (err) {
-			console.log("Error reading advancedsnippet.txt " + err);
-		} else {
-			var doTCompiled = doT.template(snippet.toString(), undefined, defs);
-			console.log("Generated function: \n" + doTCompiled.toString());
-			console.log("Result of calling with " + JSON.stringify(data) + " :\n" + doTCompiled(data));
-		}
-	});
-}());

static/static/lib/doT-1.1.3/index.js

@@ -1,150 +0,0 @@
-/* doT + auto-compilation of doT templates
- *
- * 2012, Laura Doktorova, https://github.com/olado/doT
- * Licensed under the MIT license
- *
- * Compiles .def, .dot, .jst files found under the specified path.
- * It ignores sub-directories.
- * Template files can have multiple extensions at the same time.
- * Files with .def extension can be included in other files via {{#def.name}}
- * Files with .dot extension are compiled into functions with the same name and
- * can be accessed as renderer.filename
- * Files with .jst extension are compiled into .js files. Produced .js file can be
- * loaded as a commonJS, AMD module, or just installed into a global variable
- * (default is set to window.render).
- * All inline defines defined in the .jst file are
- * compiled into separate functions and are available via _render.filename.definename
- *
- * Basic usage:
- * var dots = require("dot").process({path: "./views"});
- * dots.mytemplate({foo:"hello world"});
- *
- * The above snippet will:
- * 1. Compile all templates in views folder (.dot, .def, .jst)
- * 2. Place .js files compiled from .jst templates into the same folder.
- *    These files can be used with require, i.e. require("./views/mytemplate").
- * 3. Return an object with functions compiled from .dot templates as its properties.
- * 4. Render mytemplate template.
- */
-
-var fs = require("fs"),
-	doT = module.exports = require("./doT");
-
-doT.process = function(options) {
-	//path, destination, global, rendermodule, templateSettings
-	return new InstallDots(options).compileAll();
-};
-
-function InstallDots(o) {
-	this.__path 		= o.path || "./";
-	if (this.__path[this.__path.length-1] !== '/') this.__path += '/';
-	this.__destination	= o.destination || this.__path;
-	if (this.__destination[this.__destination.length-1] !== '/') this.__destination += '/';
-	this.__global		= o.global || "window.render";
-	this.__rendermodule	= o.rendermodule || {};
-	this.__settings 	= Object.prototype.hasOwnProperty.call(o,"templateSettings") ? copy(o.templateSettings, copy(doT.templateSettings)) : undefined;
-	this.__includes		= {};
-}
-
-InstallDots.prototype.compileToFile = function(path, template, def) {
-	def = def || {};
-	var modulename = path.substring(path.lastIndexOf("/")+1, path.lastIndexOf("."))
-		, defs = copy(this.__includes, copy(def))
-		, settings = this.__settings || doT.templateSettings
-		, compileoptions = copy(settings)
-		, defaultcompiled = doT.template(template, settings, defs)
-		, exports = []
-		, compiled = ""
-		, fn;
-
-	for (var property in defs) {
-		// It looks like the code block inside "if" below can never be executed,
-		// because InstallDots constructor is private, compileToFile is only called from compileAll method
-		// and def parameter is never passed to it, so the condition in if will always fail.
-		// This code will be removed from the next major version.
-		// For now it is only excluded from coverage report
-		/* istanbul ignore if */
-		if (defs[property] !== def[property] && defs[property] !== this.__includes[property]) {
-			fn = undefined;
-			if (typeof defs[property] === 'string') {
-				fn = doT.template(defs[property], settings, defs);
-			} else if (typeof defs[property] === 'function') {
-				fn = defs[property];
-			} else if (defs[property].arg) {
-				compileoptions.varname = defs[property].arg;
-				fn = doT.template(defs[property].text, compileoptions, defs);
-			}
-			if (fn) {
-				compiled += fn.toString().replace('anonymous', property);
-				exports.push(property);
-			}
-		}
-	}
-	compiled += defaultcompiled.toString().replace('anonymous', modulename);
-	fs.writeFileSync(path, "(function(){" + compiled
-		+ "var itself=" + modulename + ", _encodeHTML=(" + doT.encodeHTMLSource.toString() + "(" + (settings.doNotSkipEncoded || '') + "));"
-		+ addexports(exports)
-		+ "if(typeof module!=='undefined' && module.exports) module.exports=itself;else if(typeof define==='function')define(function(){return itself;});else {"
-		+ this.__global + "=" + this.__global + "||{};" + this.__global + "['" + modulename + "']=itself;}}());");
-};
-
-function addexports(exports) {
-	var ret = '';
-	for (var i=0; i< exports.length; i++) {
-		ret += "itself." + exports[i]+ "=" + exports[i]+";";
-	}
-	return ret;
-}
-
-function copy(o, to) {
-	to = to || {};
-	for (var property in o) {
-		to[property] = o[property];
-	}
-	return to;
-}
-
-function readdata(path) {
-	var data = fs.readFileSync(path);
-	if (data) return data.toString();
-	console.log("problems with " + path);
-}
-
-InstallDots.prototype.compilePath = function(path) {
-	var data = readdata(path);
-	if (data) {
-		return doT.template(data,
-					this.__settings || doT.templateSettings,
-					copy(this.__includes));
-	}
-};
-
-InstallDots.prototype.compileAll = function() {
-	if (doT.log) console.log("Compiling all doT templates...");
-
-	var defFolder = this.__path,
-		sources = fs.readdirSync(defFolder),
-		k, l, name;
-
-	for( k = 0, l = sources.length; k < l; k++) {
-		name = sources[k];
-		if (/\.def(\.dot|\.jst)?$/.test(name)) {
-			if (doT.log) console.log("Loaded def " + name);
-			this.__includes[name.substring(0, name.indexOf('.'))] = readdata(defFolder + name);
-		}
-	}
-
-	for( k = 0, l = sources.length; k < l; k++) {
-		name = sources[k];
-		if (/\.dot(\.def|\.jst)?$/.test(name)) {
-			if (doT.log) console.log("Compiling " + name + " to function");
-			this.__rendermodule[name.substring(0, name.indexOf('.'))] = this.compilePath(defFolder + name);
-		}
-		if (/\.jst(\.dot|\.def)?$/.test(name)) {
-			if (doT.log) console.log("Compiling " + name + " to file");
-			this.compileToFile(this.__destination + name.substring(0, name.indexOf('.')) + '.js',
-					readdata(defFolder + name));
-		}
-	}
-	return this.__rendermodule;
-};

static/static/lib/doT-1.1.3/package.json

@@ -1,54 +0,0 @@
-{
-  "name": "dot",
-  "description": "Concise and fast javascript templating compatible with nodejs and other javascript environments",
-  "keywords": [
-    "template",
-    "fast",
-    "simple",
-    "templating"
-  ],
-  "version": "1.1.3",
-  "main": "index.js",
-  "browser": "doT.js",
-  "bin": {
-    "dottojs": "./bin/dot-packer"
-  },
-  "homepage": "http://github.com/olado/doT",
-  "repository": "git://github.com/olado/doT.git",
-  "author": "Laura Doktorova <ldoktorova@gmail.com>",
-  "engines": [
-    "node >=0.2.6"
-  ],
-  "license": "MIT",
-  "scripts": {
-    "eslint": "if-node-version '>=4' eslint *.js --ignore-pattern *.min.js",
-    "test-spec": "mocha test/*.test.js",
-    "test-cov": "nyc npm run test-spec",
-    "test": "npm run eslint && npm run test-cov",
-    "bundle": "uglifyjs doT.js -o doT.min.js -c -m --preamble '/* Laura Doktorova https://github.com/olado/doT */'",
-    "prepublish": "npm run bundle"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "commander": "*",
-    "coveralls": "^3.0.9",
-    "eslint": "^6.7.2",
-    "if-node-version": "^1.1.1",
-    "jshint": "*",
-    "mkdirp": "*",
-    "mocha": "*",
-    "nyc": "^14.1.1",
-    "pre-commit": "^1.1.3",
-    "uglify-js": "*"
-  },
-  "nyc": {
-    "exclude": [
-      "test",
-      "node_modules"
-    ],
-    "reporter": [
-      "lcov",
-      "text-summary"
-    ]
-  }
-}

static/static/lib/doT-1.1.3/test/conditionals.test.js

@@ -1,55 +0,0 @@
-'use strict';
-
-var test = require('./util').test;
-
-describe('conditionals', function() {
-    describe('without else', function() {
-        var templates = [
-            '{{?it.one < 2}}{{=it.one}}{{?}}{{=it.two}}',
-            '{{? it.one < 2 }}{{= it.one }}{{?}}{{= it.two }}'
-        ];
-
-        it('should evaluate condition and include template if valid', function() {
-            test(templates, {one: 1, two: 2}, '12')
-        });
-
-        it('should evaluate condition and do NOT include template if invalid', function() {
-            test(templates, {one: 3, two: 2}, '2')
-        });
-    });
-
-
-    describe('with else', function() {
-        var templates = [
-            '{{?it.one < 2}}{{=it.one}}{{??}}{{=it.two}}{{?}}',
-            '{{? it.one < 2 }}{{= it.one }}{{??}}{{= it.two }}{{?}}'
-        ];
-
-        it('should evaluate condition and include "if" template if valid', function() {
-            test(templates, {one: 1, two: 2}, '1')
-        });
-
-        it('should evaluate condition and include "else" template if invalid', function() {
-            test(templates, {one: 3, two: 2}, '2')
-        });
-    });
-
-    describe('with else if', function() {
-        var templates = [
-            '{{?it.one < 2}}{{=it.one}}{{??it.two < 3}}{{=it.two}}{{??}}{{=it.three}}{{?}}',
-            '{{? it.one < 2 }}{{= it.one }}{{?? it.two < 3 }}{{= it.two }}{{??}}{{= it.three }}{{?}}'
-        ];
-
-        it('should evaluate condition and include "if" template if valid', function() {
-            test(templates, {one: 1, two: 2, three: 3}, '1')
-        });
-
-        it('should evaluate condition and include "else if" template if second condition valid', function() {
-            test(templates, {one: 10, two: 2, three: 3}, '2')
-        });
-
-        it('should evaluate condition and include "else" template if invalid', function() {
-            test(templates, {one: 10, two: 20, three: 3}, '3')
-        });
-    });
-});

static/static/lib/doT-1.1.3/test/defines.test.js

@@ -1,29 +0,0 @@
-'use strict';
-
-var doT = require('..');
-var assert = require('assert');
-
-describe('defines', function() {
-    describe('without parameters', function() {
-        it('should render define', function(){
-            testDef('{{##def.tmp:<div>{{!it.foo}}</div>#}}{{#def.tmp}}');
-        });
-
-        it('should render define if it is passed to doT.compile', function() {
-            testDef('{{#def.tmp}}', {tmp: '<div>{{!it.foo}}</div>'});
-        });
-    });
-
-    describe('with parameters', function() {
-        it('should render define', function(){
-            testDef('{{##def.tmp:foo:<div>{{!foo}}</div>#}}{{ var bar = it.foo; }}{{# def.tmp:bar }}');
-        });
-    });
-
-    function testDef(tmpl, defines) {
-        var fn = doT.compile(tmpl, defines);
-        assert.equal(fn({foo:'http'}), '<div>http</div>');
-        assert.equal(fn({foo:'http://abc.com'}), '<div>http:&#47;&#47;abc.com</div>');
-        assert.equal(fn({}), '<div></div>');
-    }
-});

static/static/lib/doT-1.1.3/test/dot.test.js

@@ -1,76 +0,0 @@
-'use strict';
-
-var test = require('./util').test;
-var assert = require("assert")
-var doT = require("..");
-
-
-describe('doT', function(){
-	var basictemplate = "<div>{{!it.foo}}</div>";
-	var basiccompiled = doT.template(basictemplate);
-
-	describe('.name', function (){
-		it('should have a name', function(){
-			assert.strictEqual(doT.name, 'doT');
-		});
-	});
-	
-	describe('#template()', function(){
-		it('should return a function', function(){
-			assert.equal(typeof basiccompiled, "function");
-		});
-	});
-
-	describe('#()', function(){
-		it('should render the template', function(){
-			assert.equal(basiccompiled({foo:"http"}), "<div>http</div>");
-			assert.equal(basiccompiled({foo:"http://abc.com"}), "<div>http:&#47;&#47;abc.com</div>");
-			assert.equal(basiccompiled({}), "<div></div>");
-		});
-	});
-
-	describe('encoding with doNotSkipEncoded=false', function() {
-		it('should not replace &', function() {
-			global._encodeHTML = undefined;
-			doT.templateSettings.doNotSkipEncoded = false;
-			var fn = doT.template('<div>{{!it.foo}}</div>');
-			assert.equal(fn({foo:"&amp;"}), "<div>&amp;</div>");
-		});
-	});
-
-	describe('interpolate 2 numbers', function() {
-		it('should print numbers next to each other', function() {
-			test([
-				'{{=it.one}}{{=it.two}}',
-				'{{= it.one}}{{= it.two}}',
-				'{{= it.one }}{{= it.two }}'
-			], {one:1, two: 2}, '12');
-		});
-	});
-
-	describe('evaluate JavaScript', function() {
-		it('should print numbers next to each other', function() {
-			test([
-				'{{ it.one = 1; it.two = 2; }}{{= it.one }}{{= it.two }}',
-			], {}, '12');
-		});
-	});
-
-	describe('encoding with doNotSkipEncoded=true', function() {
-		it('should replace &', function() {
-			global._encodeHTML = undefined;
-			doT.templateSettings.doNotSkipEncoded = true;
-			assert.equal(doT.template('<div>{{!it.foo}}</div>')({foo:"&amp;"}), "<div>&#38;amp;</div>");
-			assert.equal(doT.template('{{!it.a}}')({a:"& < > / ' \""}), "&#38; &#60; &#62; &#47; &#39; &#34;");
-			assert.equal(doT.template('{{!"& < > / \' \\""}}')(), "&#38; &#60; &#62; &#47; &#39; &#34;");
-		});
-	});
-
-	describe('invalid JS in templates', function() {
-		it('should throw exception', function() {
-			assert.throws(function() {
-				var fn = doT.template('<div>{{= foo + }}</div>');
-			});
-		});
-	});
-});

static/static/lib/doT-1.1.3/test/iteration.test.js

@@ -1,39 +0,0 @@
-'use strict';
-
-var test = require('./util').test;
-
-describe('iteration', function() {
-    describe('without index', function() {
-        it('should repeat string N times', function() {
-            test([
-                '{{~it.arr:x}}*{{~}}',
-                '{{~ it.arr:x }}*{{~}}',
-                '{{~ it.arr: x }}*{{~}}',
-                '{{~ it.arr :x }}*{{~}}'
-            ], {arr: Array(3)}, '***');
-        });
-
-        it('should concatenate items', function() {
-            test(['{{~it.arr:x}}{{=x}}{{~}}'], {arr: [1,2,3]}, '123');
-        });
-    });
-
-    describe('with index', function() {
-        it('should repeat string N times', function() {
-            test([
-                '{{~it.arr:x:i}}*{{~}}',
-                '{{~ it.arr : x : i }}*{{~}}'
-            ], {arr: Array(3)}, '***');
-        });
-
-        it('should concatenate indices', function() {
-            test(['{{~it.arr:x:i}}{{=i}}{{~}}'], {arr: Array(3)}, '012');
-        });
-
-        it('should concatenate indices and items', function() {
-            test([
-                '{{~it.arr:x:i}}{{?i}}, {{?}}{{=i}}:{{=x}}{{~}}'
-            ], {arr: [10,20,30]}, '0:10, 1:20, 2:30');
-        });
-    });
-});

static/static/lib/doT-1.1.3/test/process.test.js

@@ -1,59 +0,0 @@
-'use strict';
-
-var assert = require('assert');
-var doT = require('..');
-var fs = require('fs');
-
-
-describe('doT.process', function() {
-  beforeEach(function() {
-    removeCompiledTemplateFiles();
-  });
-
-  afterEach(function() {
-    removeCompiledTemplateFiles();
-  });
-
-  function removeCompiledTemplateFiles() {
-    try { fs.unlinkSync('./test/templates/test.js'); } catch(e) {}
-  }
-
-  it('should compile all templates in folder', function() {
-    const templates = doT.process({path: './test/templates'});
-    var str = templates.test({data: 2});
-    assert.equal(str, '21');
-
-    var js = fs.statSync('./test/templates/test.js');
-    assert.ok(js.isFile());
-
-    // code below passes if the test is run without coverage using `npm run test-spec`
-    // because source code of doT.encodeHTMLSource is used inside compiled templates
-
-    // var fn = require('./templates/test.js');
-    // var str = fn({data: 2});
-    // assert.equal(str, '21');
-  });
-
-  
-	it('should ignore varname with polluted object prototype', function() {
-    var currentLog = console.log;
-    console.log = log;
-    var logged;
-    
-    Object.prototype.templateSettings = {varname: 'it=(console.log("executed"),{})'};
-
-    try {
-      const templates = doT.process({path: './test/templates'});
-      assert.notEqual(logged, 'executed');
-      // injected code can only be executed if undefined is passed to template function
-      templates.test();
-      assert.notEqual(logged, 'executed');
-    } finally {
-      console.log = currentLog;
-    }
-    
-    function log(str) {
-      logged = str;
-    }
-  });
-});

static/static/lib/doT-1.1.3/test/templates/test.def

@@ -1 +0,0 @@
-1

static/static/lib/doT-1.1.3/test/templates/test.dot

@@ -1,2 +0,0 @@
-{{=it && it.data}}
-{{#def.test}}

static/static/lib/doT-1.1.3/test/templates/test.jst

@@ -1,2 +0,0 @@
-{{=it && it.data}}
-{{#def.test}}

static/static/lib/doT-1.1.3/test/util.js

@@ -1,11 +0,0 @@
-'use strict';
-
-var assert = require('assert')
-var doT = require('../doT');
-
-exports.test = function (templates, data, result) {
-    templates.forEach(function (tmpl) {
-        var fn = doT.template(tmpl);
-        assert.strictEqual(fn(data), result);
-    });
-};

static/static/lib/swiper/LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2019 Vladimir Kharlampidi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

static/static/lib/swiper/README.md

@@ -1,11 +0,0 @@
-Swiper
-==========
-
-Swiper - is the free and most modern mobile touch slider with hardware accelerated transitions and amazing native behavior. It is intended to be used in mobile websites, mobile web apps, and mobile native/hybrid apps.
-
-Swiper is not compatible with all platforms, it is a modern touch slider which is focused only on modern apps/platforms to bring the best experience and simplicity.
-
-# Getting Started
-  * [Getting Started Guide](https://swiperjs.com/get-started/)
-  * [API](https://swiperjs.com/swiper-api/)
-  * [Demos](https://swiperjs.com/demos/)

static/static/lib/swiper/angular/angular/src/public-api.d.ts

@@ -1,4 +0,0 @@
-export * from './swiper-events';
-export * from './swiper.module';
-export * from './swiper.component';
-export * from './swiper-slide.directive';

static/static/lib/swiper/angular/angular/src/swiper-events.d.ts

@@ -1,4 +0,0 @@
-import { SwiperEvents } from 'swiper/types';
-export declare type EventsParams<T = SwiperEvents> = {
-    [P in keyof T]: T[P] extends (...args: any[]) => any ? Parameters<T[P]> : never;
-};

static/static/lib/swiper/angular/angular/src/swiper-slide.directive.d.ts

@@ -1,27 +0,0 @@
-import { TemplateRef } from '@angular/core';
-import * as i0 from "@angular/core";
-export declare class SwiperSlideDirective {
-    template: TemplateRef<any>;
-    virtualIndex: number;
-    class: string;
-    set ngClass(val: string);
-    autoplayDelay: string | null;
-    set zoom(val: boolean);
-    get zoom(): boolean;
-    private _zoom;
-    slideIndex: number;
-    get classNames(): string;
-    set classNames(val: string);
-    private _hasClass;
-    slideData: {
-        isActive: boolean;
-        isPrev: boolean;
-        isNext: boolean;
-        isVisible: boolean;
-        isDuplicate: boolean;
-    };
-    private _classNames;
-    constructor(template: TemplateRef<any>);
-    static ɵfac: i0.ɵɵFactoryDeclaration<SwiperSlideDirective, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<SwiperSlideDirective, "ng-template[swiperSlide]", never, { "virtualIndex": "virtualIndex"; "class": "class"; "ngClass": "ngClass"; "autoplayDelay": "data-swiper-autoplay"; "zoom": "zoom"; }, {}, never>;
-}

static/static/lib/swiper/angular/angular/src/swiper.module.d.ts

@@ -1,9 +0,0 @@
-import * as i0 from "@angular/core";
-import * as i1 from "./swiper.component";
-import * as i2 from "./swiper-slide.directive";
-import * as i3 from "@angular/common";
-export declare class SwiperModule {
-    static ɵfac: i0.ɵɵFactoryDeclaration<SwiperModule, never>;
-    static ɵmod: i0.ɵɵNgModuleDeclaration<SwiperModule, [typeof i1.SwiperComponent, typeof i2.SwiperSlideDirective], [typeof i3.CommonModule], [typeof i1.SwiperComponent, typeof i2.SwiperSlideDirective]>;
-    static ɵinj: i0.ɵɵInjectorDeclaration<SwiperModule>;
-}

static/static/lib/swiper/angular/angular/src/utils/get-params.d.ts

@@ -1,10 +0,0 @@
-declare type KeyValueType = {
-    [x: string]: any;
-};
-export declare const allowedParams: string[];
-export declare function getParams(obj?: any): {
-    params: any;
-    passedParams: KeyValueType;
-    rest: KeyValueType;
-};
-export {};

static/static/lib/swiper/angular/angular/src/utils/params-list.d.ts

@@ -1 +0,0 @@
-export declare const paramsList: string[];

static/static/lib/swiper/angular/angular/src/utils/utils.d.ts

@@ -1,9 +0,0 @@
-export declare function isObject(o: any): boolean;
-export declare function isEnabled(val: boolean | {
-    enabled?: boolean;
-}): boolean;
-export declare function isShowEl(val: any, obj: any, el: any): boolean;
-export declare function extend(target: any, src: any): void;
-export declare function coerceBooleanProperty(value: any): boolean;
-export declare const ignoreNgOnChanges: string[];
-export declare function setProperty(val: any, obj?: {}): {} | false;