Skip to content

Commit

Permalink
Merge Branch 1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
soyjavi committed Mar 19, 2012
2 parents 97d93ce + 0d65cbd commit 4743aef
Show file tree
Hide file tree
Showing 134 changed files with 7,535 additions and 1,944 deletions.
16 changes: 15 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
# LungoJS
### HTML5 Mobile Framework, and stuff.

## Changes in Version 1.2
- New improved Scroll: Refresh, Append, Prepend...
- New input element (iOS 5+, Android 2.3+): type="range"
- New data-attribute: data-progress
- New <section> transitions: pop & flow
- ...
- BUG FIXED:
-

## Changes in Version 1.1.2
- BUG FIXED:
- Icon repository supported in Android Honeycomb (3.0+)
- Icon repository supported in Android IceCream Sandwich (4.0+)

## Changes in Version 1.1.1

- BUG FIXED:
- Issue #58: Fixed position in iOS Devices (4+)
- Issue #58: Fixed position in iOS Devices (4+)
- Fixed height of a scroll when overwrite a .list

## Changes in Version 1.1
Expand Down
8 changes: 4 additions & 4 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Copyright (c) 2011 TapQuo Inc (Javier Jimenez Villar)
Copyright (c) 2011-2012 TapQuo Inc (Javier Jimenez Villar)

===============================================================================
===============================================================================

OPEN SOURCE LICENSE FOR LUNGOJS
Version 1.1
Version 1.2

LungoJS is an avid supporter of open source software. This is the appropriate
option if you are creating an open source application with a license compatible
Expand All @@ -31,7 +31,7 @@ THE SOFTWARE IS LICENSED, NOT SOLD.
===============================================================================

OPEN SOURCE LICENSE FAQ
Version 1.1
Version 1.2

This document is for guidance purposes only and is not a legal document and is
not legally binding. We encourage you to read the GPL v3 and the Quick Guide to
Expand All @@ -42,7 +42,7 @@ advice.
===============================================================================

LUNGOJS AND THE GPL v3
Version 1.1
Version 1.2

-------------------------------------------------------------------------------
What is the GPL v3?
Expand Down
19 changes: 18 additions & 1 deletion examples/kitchen-sink/app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,24 @@ var App = (function(lng, undefined) {

lng.App.init({
name: 'Kitchen Sink',
version: '1.1.1'
version: '1.2',
resources: {
sections: [
'navigation.html',
'navigation-index.html',
'navigation-normal.html',
'navigation-pop.html',
'navigation-flow.html',
'buttons.html',
'lists.html',
'settings.html',
'forms.html',
'buttons-extra.html',
'aside.html',
'aside-profiles.html',
'http://examples.tapquo.com/examples/kitchen-sink/app/sections/remote.html',
'http://examples.tapquo.com/examples/kitchen-sink/app/sections/error.html']
}
});

var _getEnvironmentFromQuoJS = (function() {
Expand Down
48 changes: 48 additions & 0 deletions examples/kitchen-sink/app/events.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
App.Events = (function(lng, undefined) {

lng.ready(function() {
App.Services.mockProfiles();

lng.View.Aside.show('#kitchen-sink', '#kitchen-sink-scroll');
lng.View.Element.progress('.progress', 10, true, 'Downloading 1/5...');
});

lng.dom('#event_touchstart').touch(function(event) { alert("touchstart!"); });
//OR
//lng.dom('#event_touchstart').on('touchstart', function(event) { alert("TOUCH_START!"); });
Expand All @@ -24,5 +31,46 @@ App.Events = (function(lng, undefined) {
App.View.mockScrolls();
});

lng.dom('section#navigation-index article a').tap(function(event) {
var type_of_transition = lng.dom(this).attr('class') || 'normal';

lng.dom('section#navigation-index').removeClass('pop').removeClass('flow').addClass(type_of_transition);

setTimeout(function() {
lng.Router.section('navigation-' + type_of_transition);
}, 100);
});

//List.Append & List.prepend
lng.dom('section#lists header .onright a').tap(function(event) {
var param = {
el: '#list-dinamic',
template: 'profile-tmp',
data: {
name: 'Dinamic item list',
description: '@soyjavi'
}
};

if ($$(this).hasClass('prepend')) {
lng.View.Template.List.append(param);
} else {
lng.View.Template.List.prepend(param);
}
});


//SPECIAL
$$('section#navigation').on('load', function(event) {
console.error('Load #navigation', event);
});

$$('section#navigation').on('unload', function(event) {
console.error('Unload', event);
});

$$('article#authors').on('load', function(event) {
console.error('loaded article');
});

})(LUNGO);
15 changes: 15 additions & 0 deletions examples/kitchen-sink/app/sections/aside-profiles.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<aside id="profiles" class="scrollable onright">
<div>
<div class="anchor">Author of LungoJS</div>
<a href="http://twitter.com/soyjavi" target="_blank" data-image="assets/images/avatars/soyjavi.jpg">Javi Jim&eacute;nez Villar</a>
<div class="anchor">CoreTeam</div>
<a href="http://twitter.com/pasku1" target="_blank" data-image="assets/images/avatars/pasku.jpg">Guillermo Pascual</a>
<div class="anchor">Contributors</div>
<a href="http://twitter.com/ikalbeniz" target="_blank" data-image="assets/images/avatars/ikalbeniz.jpg">Iker Perez de Albeniz</a>
<a href="#" data-image="https://secure.gravatar.com/avatar/b374f3bd05b1db4a974585ba57661815?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png">Jorge Casar</a>
<a href="#" data-image="https://secure.gravatar.com/avatar/3d4bf44cff9779242dd82d20a0b7d0c8?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png">Dave Winders</a>
<a href="#" data-image="https://secure.gravatar.com/avatar/884b5d1e91b826afc8c6b4fc3429dbd0?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png">GermanDZ</a>
<a href="#" data-image="https://secure.gravatar.com/avatar/b41d652ca9b88e636516d907599dcc87?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png">Juan Gallego Galisteo</a>
<a href="#" data-image="https://secure.gravatar.com/avatar/a3257b495a2bc4ae15405c7880300848?s=140&d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png">John McLear</a>
</div>
</aside>
15 changes: 15 additions & 0 deletions examples/kitchen-sink/app/sections/aside.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<aside id="kitchen-sink-scroll" class="scrollable">
<div>
<div class="title">Select a option</div>
<a href="#welcome" data-target="article" class="current" data-icon="wifi">Welcome</a>
<a href="#navigation" data-target="section" data-icon="map">Navigation</a>
<a href="#buttons" data-target="article" data-icon="plus" data-count="14">Buttons & Colours</a>
<a href="#icons" data-target="article" data-icon="picture" data-count="94">Icons</a>
<a href="#data-attributes" data-target="article" data-icon="tag" data-count="6">Data Attributes</a>
<a href="#forms" data-target="section" data-icon="edit" data-count="7">Form Elements</a>
<a href="#lists" data-target="section" data-icon="items" data-count="5">Lists</a>
<a href="#events" data-target="article" data-icon="user">Events</a>
<a href="#scrolls" data-target="article" data-icon="down">Scrolls</a>
<a href="#urls" data-target="article" data-icon="down">URL Scheme Reference</a>
</div>
</aside>
18 changes: 18 additions & 0 deletions examples/kitchen-sink/app/sections/buttons-extra.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<section id="buttons-extra">
<header data-back="home" data-title="Example of buttons">
<nav class="onright">
<a href="#" class="button red " data-icon="add">With icon</a>
<a href="#" class="button arcticblue ">Text</a>
</nav>
</header>

<footer>
<nav class="onleft">
<a href="#" class="button blue ">Text</a>
<a href="#" class="button yellow " data-icon="left"></a>
</nav>
<a href="#" class="button orange onright" data-icon="right">onright</a>
</footer>

<article></article>
</section>
115 changes: 115 additions & 0 deletions examples/kitchen-sink/app/sections/forms.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<section id="forms">
<header data-title="Forms" class="extended" data-back="home">
<nav class="groupbar">
<a href="#form-inputs" data-target="article" class="current">Inputs</a>
<a href="#form-others" data-target="article">Others</a>
<a href="#form-switchs" data-target="article">Switchs</a>
<a href="#form-specials" data-target="article">Specials</a>
<a href="#form-tips" data-target="article">Tips</a>
</nav>
</header>

<article id="form-inputs" class="list scrollable">
<div class="container indented">
<ul class="form">
<li class="anchor" data-icon="edit">Example of inputs</li>
<li>
<label>type="text"</label>
<input type="text" placeholder="Input text"/>
<label>type="password"</label>
<input type="password" placeholder="Input password"/>
</li>
</ul>

<ul class="form">
<li class="anchor" data-icon="edit">Example of textarea</li>
<li><textarea placeholder="Textarea sample"></textarea></li>
</ul>

<ul class="form">
<li class="anchor" data-icon="edit">Example of select</li>
<li>
<label class="select">
<select class="custom">
<option value="1">One</option>
<option value="2">Two</option>
<option value="3">Three</option>
</select>
</label>
</li>
<li class="tip dark" data-icon="question mini">It's a special form element you must set the label with class "select"</li>
</ul>
</div>
</article>

<article id="form-others" class="list">
<div class="indented">
<ul class="form">
<li class="anchor" data-icon="edit">Example of search</li>
<li data-search="Type a search..."></li>
<li class="tip darker" data-icon="question mini">It's a special form element you must set the attribute data-search="Placeholder text"</li>
<li class="anchor" data-icon="edit">Example of type="*"</li>
<li>
<input type="datetime" placeholder="Some datetime..." />
<input type="date" placeholder="Some date..." />
<input type="time" placeholder="Some time..." />
<input type="month" placeholder="Some month..." />
</li>
<li class="tip dark" data-icon="question mini">Only for iOS5 & Android 2.3+ Devices"</li>
</ul>
</div>
</article>

<article id="form-specials" class="list">
<div class="indented">
<ul class="form">
<li class="anchor" data-icon="edit">Example of progress</li>
<li data-progress="0%"></li>
<li class="anchor" data-icon="edit">Example of range</li>
<li> <input type="range"></li>
<li class="tip dark" data-icon="question mini">Only for iOS5 & Android 2.3+ Devices"</li>
</ul>
</div>
</article>

<article id="form-switchs" class="list">
<div class="container indented">
<ul class="form">
<li class="anchor" data-icon="edit">Example of checkbox</li>
<li>
<label>Do you like LungoJS forms?</label>
<label class="checkbox onright"><input type="checkbox" id="checkbox-0" checked/></label>
</li>
</ul>

<ul class="form">
<li class="anchor" data-icon="edit">Example of radio</li>
<li>
<label class="radio"><input type="radio" name="group-0" id="radio-0" checked="checked"/></label>
<label class="radio"><input type="radio" name="group-0" id="radio-1"/></label>
<label class="radio"><input type="radio" name="group-0" id="radio-2"/></label>
</li>
</ul>
</div>
</article>

<article id="form-tips" class="list scrollable">
<div class="container indented">
<ul class="form">
<li class="anchor">Examples of tips</li>
<li class="tip" data-icon="home mini">Lorem Ipsum is simply dummy text...</li>
<li class="tip dark" data-icon="home mini">Lorem Ipsum is simply dummy text...</li>
<li class="tip darker" data-icon="home mini">Lorem Ipsum is simply dummy text...</li>

<li class="tip" data-icon="home">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's...</li>
<li class="tip dark" data-icon="home">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's...</li>
<li class="tip darker" data-icon="home">Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's...</li>
</ul>

<ul class="form">
<li class="anchor" data-icon="home">Example of anchor</li>
<li><label>Example of label</label></li>
</ul>
</div>
</article>
</section>
19 changes: 19 additions & 0 deletions examples/kitchen-sink/app/sections/lists.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<section id="lists">
<header data-back="home" data-title="Lists" class="extended">
<nav class="onright">
<a href="#" data-article="list-dinamic" class="button" data-icon="up"></a>
<a href="#" data-article="list-dinamic" class="button prepend" data-icon="down"></a>
</nav>
<nav class="groupbar">
<a href="#list-plain" data-target="article" class="current">Normal</a>
<a href="#list-ordered" data-target="article">Ordered</a>
<a href="#list-indented" data-target="article">Indented</a>
<a href="#list-dinamic" data-target="article">Dinamic</a>
</nav>
</header>

<article id="list-plain" class="list"></article>
<article id="list-ordered" class="list"></article>
<article id="list-indented" class="list indented scrollable"></article>
<article id="list-dinamic" class="list scrollable"></article>
</section>
5 changes: 5 additions & 0 deletions examples/kitchen-sink/app/sections/local.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<section id="async-local">
<header data-back="home" data-title="Async Local Section"></header>

<article></article>
</section>
4 changes: 4 additions & 0 deletions examples/kitchen-sink/app/sections/navigation-flow.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<section id="navigation-flow" class="flow">
<header data-back="home"></header>
<article></article>
</section>
10 changes: 10 additions & 0 deletions examples/kitchen-sink/app/sections/navigation-index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<section id="navigation-index" class="">
<header data-back="home" data-title="Type of transitions"></header>
<article class="list indented">
<ul>
<li><a href="#">Normal Transition</a></li>
<li><a href="#" class="pop">Pop Transition</a></li>
<li><a href="#" class="flow">Flow Transition</a></li>
</ul>
</article>
</section>
4 changes: 4 additions & 0 deletions examples/kitchen-sink/app/sections/navigation-normal.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<section id="navigation-normal">
<header data-back="home"></header>
<article></article>
</section>
4 changes: 4 additions & 0 deletions examples/kitchen-sink/app/sections/navigation-pop.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<section id="navigation-pop" class="pop">
<header data-back="home"></header>
<article></article>
</section>
Loading

0 comments on commit 4743aef

Please sign in to comment.