solve conflicts

This commit is contained in:
Mario Colque 2014-02-28 16:20:31 -03:00
commit 8200f2121b
3 changed files with 11 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -6,4 +6,10 @@ angular.module('insight')
start = +start; //parse to int
return input.slice(start);
}
});
})
.filter('split', function() {
return function(input, delimiter) {
var delimiter = delimiter || ',';
return input.split(delimiter);
}
});

View File

@ -78,7 +78,9 @@
<div class="panel-body" style="word-wrap:break-word" data-ng-class="{true: 'v_highlight', false: ''}[from_vin == true && v_index == vin.n]">
<small>
<strong>scriptSig</strong>
{{vin.scriptSig.asm}}
<span data-ng-repeat="item in vin.scriptSig.asm | split:' '">
<span>{{item}}</span><br><br>
</span>
</small>
</div>
</div>