Skip to content

Commit

Permalink
última versión
Browse files Browse the repository at this point in the history
  • Loading branch information
@davsket
davsket committed Aug 8, 2013
1 parent 5c3a7a8 commit c6c9bbb
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 67 deletions.
51 changes: 27 additions & 24 deletions artista.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,50 @@
</head>
<body>
<h1>Buscador de Artistas</h1>
<label for="artist">Ingresa tu artista favorito</label>
<label for="artista">Ingresa tu artista favorito:</label>
<input type="text" id="artista">
<button id="buscar">buscar</button>
<div id="resultado"></div>

<script type="text" id="artist">
<article class="content">
<h2 id="nombre-artista"></h2>
<figure>
<img src="" alt="">
<figcaption></figcaption>
</figure>
<aside id="band-members"></aside>
<p id="bio-artista"></p>
</article>
</script>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>

<script>
var $artista = $('#artista'),
$buscar = $('#buscar')

$artista.on('keyup', function(evt){
if( evt.keyCode == '13' ){ // enter
buscarArtista()
}
})
$buscar.on('click', buscarArtista)
$buscar = $('#buscar'),
$resultado = $('#resultado');

function buscarArtista(){
//Peticion AJAX
var artista = $artista.val(),
api_key = '42f75f939105d2110d6a0daf27db431c';

$.ajax({
data: {
artist: $artista.val(),
api_key: '42f75f939105d2110d6a0daf27db431c',
artist: artista,
api_key: api_key,
format: 'json',
method: 'artist.getinfo'
},
url: 'http://ws.audioscrobbler.com/2.0/'
})
.done( presentarArtista )
}

function presentarArtista( data ){
var artista = data.artist,
html = '';

html += '<h2>' + artista.name + '</h2>';
html += '<figure><img src="' +
artista.image[ artista.image.length - 1 ]['#text'] +
'" alt=""><figcaption>' +
artista.image[ artista.image.length - 1 ].size +
'</figcaption></figure>';
html += '<p>' + artista.bio.summary + '</p>';

$resultado.html( html );
}

$buscar.on('click', buscarArtista);
</script>
</body>
</html>
31 changes: 16 additions & 15 deletions calculadora.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,43 @@ <h1>Calculadora</h1>
<option value="+">más</option>
<option value="-">menos</option>
<option value="*">por</option>
<option value="/">dividido por</option>
<option value="/">divido por</option>
</select>
<label for="var-b">variable b</label>
<input type="text" id="var-b">
<button id="calcular">calcular</button>
<label for="var-a">resultado:</label>
<input type="text" id="resultado">

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script>
//Nuestro código
var $vara = $('#var-a'),
$varb = $('#var-b'),
$operador = $('#operador'),
$calcular = $('#calcular'),
$resultado = $('#resultado');

function calcular(){
var operador, a, b, resultado;
var op, a, b, res;

a = $vara.val();
b = $varb.val();
operador = $operador.val();
a = parseInt( $vara.val() );
b = parseInt( $varb.val() );
op = $operador.val();

if(operador == '+'){
resultado = a + b
}else if(operador == '-'){
resultado = a - b
}else if(operador == '*'){
resultado = a * b
if( op == '+' ){
res = a + b
}else if( op == '-' ){
res = a - b
}else if( op == '*' ){
res = a * b
}else{
resultado = a / b
res = a / b
}

$resultado.val( resultado )
$resultado.val( res )
}

$calcular.on('click', calcular)
$calcular.on('click', calcular)
</script>
</body>
</html>
62 changes: 35 additions & 27 deletions ciclos.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,29 @@
<html>
<head>
<meta charset="utf-8">
<title>Contar vocales</title>
<title>Contador de Vocales</title>
</head>
<body>
<h1>Calculador de Vocales</h1>
<h1>Contador de Vocales</h1>
<label for="frase">Ingresa tu frase:</label>
<input type="text" id="frase">
<button id="contar">Contar vocales</button>
<h2>Resultados</h2>
<div>
A <span id="a-cantidad"></span>
</div>
<div>
E <span id="e-cantidad"></span>
</div>
<div>
I <span id="i-cantidad"></span>
</div>
<div>
O <span id="o-cantidad"></span>
</div>
<div>
U <span id="u-cantidad"></span>
<button id="contar">contar vocales</button>
<div class="resultados">
<div class="res">
A <span id="a-vocal"></span>
</div>
<div class="res">
E <span id="e-vocal"></span>
</div>
<div class="res">
I <span id="i-vocal"></span>
</div>
<div class="res">
O <span id="o-vocal"></span>
</div>
<div class="res">
U <span id="u-vocal"></span>
</div>
</div>

<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
Expand All @@ -33,26 +34,33 @@ <h2>Resultados</h2>
$contar = $('#contar'),
vocales = 'aeiou';

$frase.on('keyup', function( evt ){
if( evt.keyCode == '13' ){
contarVocales()
}
})
$contar.on('click', contarVocales)

function contarVocales(){
var frase = $frase.val(),
res = { a:0, e:0, i:0, o:0, u:0 },
// var frase = $frase.val(),
var frase = $frase.val().toLowerCase(),
res = {a:0, e:0, i:0, o:0, u:0},
letra;

for(var i=0; i<frase.length; i++){
for(var i=0; i<frase.length; ++i){
letra = frase[i];
if( vocales.indexOf(letra) != -1 ){// es una vocal
if( vocales.indexOf( letra ) != -1 ){
// res[letra] = res[letra] + 1;
++res[letra];
// res[letra] += 1;
res[letra]++;
}
}

for( var key in res ){
// recorrer cada indentificador o taributo del obj res
$('#'+key+'-cantidad').text( res[key] )
console.log( key, res[ key ], $('#' + key + '-vocal') )
$('#' + key + '-vocal').text( res[ key ] )
}
}

$contar.on('click', contarVocales)
</script>
</body>
</html>
Binary file added presentacion.pdf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion res/js/canvas-vs-svg.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

ctx.beginPath()
ctx.arc(x, y, r, 0, 2 * Math.PI, false)
ctx.fillStyle = 'red'
ctx.fillStyle = fill
ctx.fill()
ctx.strokeStyle = strokeStyle
ctx.lineWidth = 4
Expand Down

0 comments on commit c6c9bbb

Please sign in to comment.