@dolphinweex/weex-vue-render 0.2.7 → 0.2.9

package/dist/index.common.js

@@ -3460,7 +3460,7 @@ function applySrc (item, src, placeholderSrc) {
    * 1. apply src immediately in case javscript blocks the image loading
    *  before next tick.
    */
-  item.style.backgroundImage = "url(" + (src ? encodeURI(src) : '') + ")";
+  item.style.backgroundImage = "url(" + (src ? encodeURI(decodeURI(src)) : '') + ")";
   item.removeAttribute(lazyloadAttr);
   /**
    * 2. then load the img src with Image constructor (but would not post
@@ -3468,7 +3468,7 @@ function applySrc (item, src, placeholderSrc) {
    */
   item._src_loading = src;
   preLoadImg(src, function (evt) {
-    item.style.backgroundImage = "url(" + (src ? encodeURI(src) : '') + ")";
+    item.style.backgroundImage = "url(" + (src ? encodeURI(decodeURI(src)) : '') + ")";
     var ref = this;
     var naturalWidth = ref.width;
     var naturalHeight = ref.height;
@@ -3486,7 +3486,7 @@ function applySrc (item, src, placeholderSrc) {
     dispatchNativeEvent(item, 'load', params);
     if (placeholderSrc) {
       preLoadImg(placeholderSrc, function () {
-        item.style.backgroundImage = "url(" + (placeholderSrc ? encodeURI(placeholderSrc) : '') + ")";
+        item.style.backgroundImage = "url(" + (placeholderSrc ? encodeURI(decodeURI(placeholderSrc)) : '') + ")";
       });
     }
     finallCb();
@@ -3985,7 +3985,7 @@ function initEnv (viewportInfo, envInfo) {
     osName: osName,
     osVersion: osVersion,
     
-    deviceModel: device_display.deviceModel || null,
+    deviceModel: device_display.deviceModel || "",
     appEnv: device_display.appEnv,
     versionCode: device_display.versionCode,
     idfa: device_display.idfa,
@@ -6281,6 +6281,67 @@ var scroller = {
   }
 };
 
+function getGCanvas (weex) {
+  var extractComponentStyle = weex.extractComponentStyle;
+  var ref = weex.utils;
+  var dispatchNativeEvent = ref.dispatchNativeEvent;
+
+  return {
+    name: 'weex-gcanvas',
+    mounted: function mounted() {
+      var wrapper = this.$refs.gcanvas;
+      var rate = 750 / document.documentElement.clientWidth 
+      wrapper.width = wrapper.clientWidth * rate;
+      wrapper.height = wrapper.clientWidth * rate;
+
+      var context = wrapper.getContext(type || '2d')
+      context.scale(rate, rate)
+    },
+    methods:{
+      getContext: function (type) {
+        var wrapper = this.$refs.gcanvas;
+        var context = wrapper.getContext(type || '2d')
+        return context
+      },
+  
+      getContextAsyn: function (type, callback) {
+        var wrapper = this.$refs.gcanvas;
+        var context = wrapper.getContext(type || '2d') 
+        callback(context)
+      },
+  
+      drawImage: function (url) {
+        var wrapper = this.$refs.gcanvas;
+        var context = wrapper.getContext(type || '2d')
+
+        var img = new Image();
+        img.src = url
+        arguments[0] = img
+        return context.drawImage.apply(context, arguments)
+      }
+    },
+    render: function render (createElement) {
+      var attrs = this.$vnode.data.attrs;
+      return createElement('canvas', {
+        attrs: {
+          'weex-type': 'gcanvas'
+        },
+        ref: 'gcanvas',
+        staticClass: 'weex-gcanvas weex-ct',
+        staticStyle: extractComponentStyle(this)
+      })
+    } 
+  }
+}
+
+var gcanvas = {
+  init: function (Weex) {
+    Weex.registerComponent('gcanvas', getGCanvas(Weex))
+  }
+};
+
+
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -7208,7 +7269,7 @@ var recycleList = {
   }
 };
 
-__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\nbody > .weex-list,\nbody > .weex-recycle,\nbody > .weex-scroller,\nbody > .weex-waterfall {\n  max-height: 100%;\n}\n\n.weex-list-wrapper,\n.weex-recycle-wrapper,\n.weex-scroller-wrapper,\n.weex-waterfall-wrapper {\n  -webkit-overflow-scrolling: touch;\n}\n\n.weex-list-wrapper,\n.weex-waterfall-wrapper, \n.weex-recycle-wrapper {\n  overflow-y: scroll !important;\n  overflow-x: hidden !important;\n  align-items: flex-start !important;\n  justify-content: flex-start !important;\n}\n\n.weex-list-inner,\n.weex-recycle-inner,\n.weex-scroller-inner,\n.weex-waterfall-inner {\n  -webkit-overflow-scrolling: touch;\n align-items: inherit; \n}\n\n.weex-waterfall-inner-columns {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n}\n\n.weex-scroller-wrapper.weex-scroller-vertical,\n.weex-recycle-wrapper.weex-recycle-vertical  {\n  overflow-x: hidden;\n  overflow-y: scroll;\n}\n\n.weex-scroller-wrapper.weex-scroller-horizontal,\n.weex-recycle-wrapper.weex-recycle-horizontal {\n  overflow-x: scroll;\n  overflow-y: hidden;\n}\n\n.weex-scroller-wrapper.weex-scroller-disabled {\n  overflow-x: hidden;\n  overflow-y: hidden;\n}\n\n.weex-scroller-horizontal .weex-scroller-inner,\n.weex-recycle-horizontal .weex-recycle-inner {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n  height: 100%;\n}\n\n.weex-cell {\n  width: 100%;\n}\n\n.weex-refresh,\n.weex-loading {\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n  align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n  justify-content: center;\n  width: 100%;\n  overflow: hidden;\n}\n",undefined);
+__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n\nbody > .weex-list,\nbody > .weex-recycle,\nbody > .weex-scroller,\nbody > .weex-waterfall {\n  max-height: 100%;\n}\n\n.weex-list-wrapper,\n.weex-recycle-wrapper,\n.weex-scroller-wrapper,\n.weex-waterfall-wrapper {\n  -webkit-overflow-scrolling: touch;\n}\n\n.weex-list-wrapper,\n.weex-waterfall-wrapper, \n.weex-recycle-wrapper {\n  overflow-y: scroll !important;\n  overflow-x: hidden !important;\n  align-items: flex-start !important;\n  justify-content: flex-start !important;\n}\n\n.weex-list-inner,\n.weex-recycle-inner,\n.weex-scroller-inner,\n.weex-waterfall-inner {\n  -webkit-overflow-scrolling: touch;\n align-items: inherit; \n}\n\n.weex-waterfall-inner-columns { \n margin:0 auto; \n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n}\n\n.weex-scroller-wrapper.weex-scroller-vertical,\n.weex-recycle-wrapper.weex-recycle-vertical  {\n  overflow-x: hidden;\n  overflow-y: scroll;\n}\n\n.weex-scroller-wrapper.weex-scroller-horizontal,\n.weex-recycle-wrapper.weex-recycle-horizontal {\n  overflow-x: scroll;\n  overflow-y: hidden;\n}\n\n.weex-scroller-wrapper.weex-scroller-disabled {\n  overflow-x: hidden;\n  overflow-y: hidden;\n}\n\n.weex-scroller-horizontal .weex-scroller-inner,\n.weex-recycle-horizontal .weex-recycle-inner {\n  -webkit-flex-direction: row;\n  flex-direction: row;\n  -webkit-box-orient: horizontal;\n  height: 100%;\n}\n\n.weex-cell {\n  width: 100%;\n}\n\n.weex-refresh,\n.weex-loading {\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n  align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n  justify-content: center;\n  width: 100%;\n  overflow: hidden;\n}\n",undefined);
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -7236,6 +7297,7 @@ var modules = [
   waterfall,
   // cell,
   header,
+  gcanvas,
   loading,
   refresh,
   loadingIndicator$1,

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.7"
+  "version": "0.2.9"
 }