Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
4 changed files
with
48 additions
and
3 deletions
1 | {{> layout/page-footer}} | 1 | {{> layout/page-footer}} |
2 | + {{#if rlsEnv}} | ||
3 | + <script src="http://cdn.yoho.cn/yohobuy/{{version}}/lib.js"></script> | ||
4 | + <script src="http://cdn.yoho.cn/yohobuy/{{version}}/index.js"></script> | ||
5 | + {{/if}} | ||
6 | + {{#if preEnv}} | ||
7 | + <script src="http://cdn.yoho.cn/yohobuy/{{version}}/lib.js"></script> | ||
8 | + <script src="http://cdn.yoho.cn/yohobuy/{{version}}/index.js"></script> | ||
9 | + {{/if}} | ||
10 | + {{#if testEnv}} | ||
11 | + <script src="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/lib.js"></script> | ||
12 | + <script src="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index-debug.js"></script> | ||
13 | + {{/if}} | ||
14 | + {{#if devEnv}} | ||
2 | <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> | 15 | <script src="http://localhost:8000/static/js/sea.js?nowrap"></script> |
3 | <script> | 16 | <script> |
4 | seajs.config({ | 17 | seajs.config({ |
5 | base: 'http://localhost:8000/' | 18 | base: 'http://localhost:8000/' |
6 | }); | 19 | }); |
7 | </script> | 20 | </script> |
21 | + {{/if}} | ||
8 | {{> layout/use}} | 22 | {{> layout/use}} |
9 | </body> | 23 | </body> |
10 | </html> | 24 | </html> |
@@ -9,10 +9,30 @@ | @@ -9,10 +9,30 @@ | ||
9 | <meta name="keywords" content="{{keywords}}"> | 9 | <meta name="keywords" content="{{keywords}}"> |
10 | <meta name="description" content="{{description}}"> | 10 | <meta name="description" content="{{description}}"> |
11 | <title>{{title}}</title> | 11 | <title>{{title}}</title> |
12 | + {{#if rlsEnv}} | ||
12 | <!-- [if (gte IE 6)&(lte IE 8)> | 13 | <!-- [if (gte IE 6)&(lte IE 8)> |
13 | - <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script> | 14 | + <script src="http://cdn.yoho.cn/yohobuy/respond.min.js"></script> |
15 | + <![endif]--> | ||
16 | + <link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css"> | ||
17 | + {{/if}} | ||
18 | + {{#if preEnv}} | ||
19 | + <!-- [if (gte IE 6)&(lte IE 8)> | ||
20 | + <script src="http://cdn.yoho.cn/yohobuy/respond.min.js"></script> | ||
21 | + <![endif]--> | ||
22 | + <link rel="stylesheet" href="http://cdn.yoho.cn/yohobuy/{{version}}/index.css"> | ||
23 | + {{/if}} | ||
24 | + {{#if testEnv}} | ||
25 | + <!-- [if (gte IE 6)&(lte IE 8)> | ||
26 | + <script src="http://static.buy.test.yoho.cn/dist/yohobuy/respond.min.js"></script> | ||
27 | + <![endif]--> | ||
28 | + <link rel="stylesheet" href="http://static.buy.test.yoho.cn/dist/yohobuy/{{version}}/index.css"> | ||
29 | + {{/if}} | ||
30 | + {{#if devEnv}} | ||
31 | + <!-- [if (gte IE 6)&(lte IE 8)> | ||
32 | + <script src="http://webstatic.dev.yohobuy.com/plugin/page-use/respond.min.js"></script> | ||
14 | <![endif]--> | 33 | <![endif]--> |
15 | <link rel="stylesheet" href="http://webstatic.dev.yohobuy.com/css/index.css"> | 34 | <link rel="stylesheet" href="http://webstatic.dev.yohobuy.com/css/index.css"> |
35 | + {{/if}} | ||
16 | </head> | 36 | </head> |
17 | <body> | 37 | <body> |
18 | {{> layout/page-header}} | 38 | {{> layout/page-header}} |
@@ -72,10 +72,10 @@ gulp.task('spm-doc', function() { | @@ -72,10 +72,10 @@ gulp.task('spm-doc', function() { | ||
72 | }); | 72 | }); |
73 | 73 | ||
74 | //生成发布目录,可用于上传测试机 | 74 | //生成发布目录,可用于上传测试机 |
75 | -gulp.task('ge', ['assets', 'compass-production', 'build']); | 75 | +gulp.task('ge', ['assets', 'compass-production', 'build', 'script']); |
76 | 76 | ||
77 | //发布 | 77 | //发布 |
78 | -gulp.task('dist', ['assets', 'compass-production', 'build'], function() { | 78 | +gulp.task('dist', ['assets', 'compass-production', 'build', 'script'], function() { |
79 | var ftpstream = ftp(ftpConfig); | 79 | var ftpstream = ftp(ftpConfig); |
80 | 80 | ||
81 | return gulp.src('dist/**/') | 81 | return gulp.src('dist/**/') |
@@ -191,3 +191,9 @@ gulp.task('business', ['libs'], function() { | @@ -191,3 +191,9 @@ gulp.task('business', ['libs'], function() { | ||
191 | .pipe(concat('index.js')) | 191 | .pipe(concat('index.js')) |
192 | .pipe(gulp.dest(distDir.js)); | 192 | .pipe(gulp.dest(distDir.js)); |
193 | }); | 193 | }); |
194 | + | ||
195 | +//页面需要直接标签引用的JS | ||
196 | +gulp.task('script', function() { | ||
197 | + gulp.src('plugin/page-use/*') | ||
198 | + .pipe(gulp.dest(rootDist)); | ||
199 | +}); |
web-static/plugin/page-use/respond.min.js
0 → 100644
1 | +/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl | ||
2 | + * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT | ||
3 | + * */ | ||
4 | + | ||
5 | +!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='­<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this); |
-
Please register or login to post a comment