Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb70bffe

Browse files
committed
fix indentation styles per eslint 1.5
1 parent2a41b3a commitb70bffe

File tree

6 files changed

+71
-52
lines changed

6 files changed

+71
-52
lines changed

‎src/api/data.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,15 @@ exports.$interpolate = function (text) {
120120
vartokens=textParser.parse(text)
121121
varvm=this
122122
if(tokens){
123-
returntokens.length===1
124-
?vm.$eval(tokens[0].value)
125-
:tokens.map(function(token){
126-
returntoken.tag
127-
?vm.$eval(token.value)
128-
:token.value
129-
}).join('')
123+
if(tokens.length===1){
124+
returnvm.$eval(tokens[0].value)
125+
}else{
126+
returntokens.map(function(token){
127+
returntoken.tag
128+
?vm.$eval(token.value)
129+
:token.value
130+
}).join('')
131+
}
130132
}else{
131133
returntext
132134
}

‎src/compiler/compile.js‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -592,22 +592,26 @@ function collectAttrDirective (name, value, options) {
592592
allOneTime=false
593593
}
594594
}
595+
varlinker
596+
if(allOneTime){
597+
linker=function(vm,el){
598+
el.setAttribute(name,vm.$interpolate(value))
599+
}
600+
}else{
601+
linker=function(vm,el){
602+
varexp=textParser.tokensToExp(tokens,vm)
603+
vardesc=isClass
604+
?dirParser.parse(exp)[0]
605+
:dirParser.parse(name+':'+exp)[0]
606+
if(isClass){
607+
desc._rawClass=value
608+
}
609+
vm._bindDir(dirName,el,desc,def)
610+
}
611+
}
595612
return{
596613
def:def,
597-
_link:allOneTime
598-
?function(vm,el){
599-
el.setAttribute(name,vm.$interpolate(value))
600-
}
601-
:function(vm,el){
602-
varexp=textParser.tokensToExp(tokens,vm)
603-
vardesc=isClass
604-
?dirParser.parse(exp)[0]
605-
:dirParser.parse(name+':'+exp)[0]
606-
if(isClass){
607-
desc._rawClass=value
608-
}
609-
vm._bindDir(dirName,el,desc,def)
610-
}
614+
_link:linker
611615
}
612616
}
613617
}

‎src/directive.js‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var config = require('./config')
33
varWatcher=require('./watcher')
44
vartextParser=require('./parsers/text')
55
varexpParser=require('./parsers/expression')
6+
functionnoop(){}
67

78
/**
89
* A directive links a DOM element with a piece of data,
@@ -73,13 +74,15 @@ Directive.prototype._bind = function (def) {
7374
!this._checkStatement()){
7475
// wrapped updater for context
7576
vardir=this
76-
varupdate=this._update=this.update
77-
?function(val,oldVal){
78-
if(!dir._locked){
79-
dir.update(val,oldVal)
80-
}
77+
if(this.update){
78+
this._update=function(val,oldVal){
79+
if(!dir._locked){
80+
dir.update(val,oldVal)
8181
}
82-
:function(){}// noop if no update is provided
82+
}
83+
}else{
84+
this._update=noop
85+
}
8386
// pre-process hook called before the value is piped
8487
// through the filters. used in v-repeat.
8588
varpreProcess=this._preProcess
@@ -88,7 +91,7 @@ Directive.prototype._bind = function (def) {
8891
varwatcher=this._watcher=newWatcher(
8992
this.vm,
9093
this._watcherExp,
91-
update,// callback
94+
this._update,// callback
9295
{
9396
filters:this.filters,
9497
twoWay:this.twoWay,

‎src/filters/array-filters.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ exports.filterBy = function (arr, search, delimiter /* ...dataKeys */) {
2626
returnprev.concat(cur)
2727
},[])
2828
returnarr.filter(function(item){
29-
returnkeys.length
30-
?keys.some(function(key){
31-
returncontains(Path.get(item,key),search)
32-
})
33-
:contains(item,search)
29+
if(keys.length){
30+
returnkeys.some(function(key){
31+
returncontains(Path.get(item,key),search)
32+
})
33+
}else{
34+
returncontains(item,search)
35+
}
3436
})
3537
}
3638

‎src/parsers/template.js‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,22 +156,28 @@ function nodeToFragment (node) {
156156

157157
// Test for the presence of the Safari template cloning bug
158158
// https://bugs.webkit.org/show_bug.cgi?id=137755
159-
varhasBrokenTemplate=_.inBrowser
160-
?(function(){
161-
vara=document.createElement('div')
162-
a.innerHTML='<template>1</template>'
163-
return!a.cloneNode(true).firstChild.innerHTML
164-
})()
165-
:false
159+
varhasBrokenTemplate=(function(){
160+
/* istanbul ignore else */
161+
if(_.inBrowser){
162+
vara=document.createElement('div')
163+
a.innerHTML='<template>1</template>'
164+
return!a.cloneNode(true).firstChild.innerHTML
165+
}else{
166+
returnfalse
167+
}
168+
})()
166169

167170
// Test for IE10/11 textarea placeholder clone bug
168-
varhasTextareaCloneBug=_.inBrowser
169-
?(function(){
170-
vart=document.createElement('textarea')
171-
t.placeholder='t'
172-
returnt.cloneNode(true).value==='t'
173-
})()
174-
:false
171+
varhasTextareaCloneBug=(function(){
172+
/* istanbul ignore else */
173+
if(_.inBrowser){
174+
vart=document.createElement('textarea')
175+
t.placeholder='t'
176+
returnt.cloneNode(true).value==='t'
177+
}else{
178+
returnfalse
179+
}
180+
})()
175181

176182
/**
177183
* 1. Deal with Safari cloning nested <template> bug by

‎src/parsers/text.js‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,13 @@ exports.parse = function (text) {
118118
*/
119119

120120
exports.tokensToExp=function(tokens,vm){
121-
returntokens.length>1
122-
?tokens.map(function(token){
123-
returnformatToken(token,vm)
124-
}).join('+')
125-
:formatToken(tokens[0],vm,true)
121+
if(tokens.length>1){
122+
returntokens.map(function(token){
123+
returnformatToken(token,vm)
124+
}).join('+')
125+
}else{
126+
returnformatToken(tokens[0],vm,true)
127+
}
126128
}
127129

128130
/**

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp