Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/tapquo/Lungo.js
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/tapquo/Lungo.js:
  Fixed documentation
  Fixed Lungo.Data Namespace to Lungo.Cache
  Fixed issue in navigation documentation
  Remove [brownie] reference
  Remove brownie package
  • Loading branch information
pinaypunto committed Aug 12, 2013
2 parents 0c3bbf6 + 37d7be1 commit 59dff91
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 288 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
[submodule "package/lungo.icon"]
path = package/lungo.icon
url = https://github.com/tapquo/lungo.icon.git
[submodule "example/components/lungo.brownie"]
path = example/components/lungo.brownie
url = https://github.com/soyjavi/lungo.brownie.git
[submodule "package/lungo.thirdparties"]
path = package/lungo.thirdparties
url = https://github.com/tapquo/lungo.thirdparties.git
Expand Down
16 changes: 9 additions & 7 deletions GruntFile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ module.exports = (grunt) ->

meta:
file: 'lungo'
temp: "build",
package: "package",
plugins: "src/plugins",
# BETA
endpoint: "example/components",
version: ".brownie",
# endpoint: "example/components",
# version: ".brownie",
# RELEASE
# endpoint: "package",
# version: "",
endpoint: "package",
version: "",
banner: '/* <%= pkg.name %> v<%= pkg.version %> - <%= grunt.template.today("yyyy/m/d") %>\n' +
' <%= pkg.homepage %>\n' +
' Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>' +
Expand Down Expand Up @@ -56,14 +57,13 @@ module.exports = (grunt) ->
coffee: 'src/plugins/calendar/**.coffee'
stylus: 'src/plugins/calendar/**.styl'


coffee:
core: files: '<%=meta.endpoint%>/<%=meta.file%><%=meta.version%>/<%=meta.file%>.debug.js': '<%= source.coffee %>'
core: files: '<%=meta.temp%>/<%=meta.file%>.debug.js': '<%= source.coffee %>'
calendar: files: 'package/lungo.calendar/lungo.calendar.js': '<%= source.calendar.coffee %>'

uglify:
options: compress: false, banner: "<%= meta.banner %>"
engine: files: '<%=meta.endpoint%>/<%=meta.file%><%=meta.version%>/<%=meta.file%>.js': '<%=meta.endpoint%>/<%=meta.file%><%=meta.version%>/<%=meta.file%>.debug.js'
engine: files: '<%=meta.endpoint%>/<%=meta.file%><%=meta.version%>/<%=meta.file%>.js': '<%=meta.temp%>/<%=meta.file%>.debug.js'

stylus:
core:
Expand All @@ -80,6 +80,8 @@ module.exports = (grunt) ->
copy:
theme:
expand: true, flatten: true, src: '<%=source.theme%>', dest: '<%=meta.package%>/<%=meta.file%>.theme/'
icon:
expand: false, flatten: true, src: '<%=meta.package%>/<%=meta.file%>.icon/<%=meta.file%>.icon.css', dest: '<%=meta.endpoint%>/<%=meta.file%><%=meta.version%>/<%=meta.file%>.icon.css'

watch:
coffee:
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,10 @@ The `data-view-*` attribute is set in the `<a>` or `<button>` element to set the
``` html
<section id="main">
<article id="article_1" class="active">
<button class="button" data-view-article="article_1" data-icon="forward">To article_2</button>
<button class="button" data-view-article="article_2" data-icon="forward">To article_2</button>
</article>
<article id="article_2">
<button class="button" data-view-article="article_2" data-icon="home" data-label="To article_1"></button>
<button class="button" data-view-article="article_1" data-icon="home" data-label="To article_1"></button>
</article>
</section>
```
Expand Down Expand Up @@ -605,7 +605,7 @@ object: Value asigned to the key.
*Example*
``` javascript
var framework = {name: "Lungo", twitter: "lungojs"};
Lungo.Data.Cache.set("lungoFramework", framework);
Lungo.Cache.set("lungoFramework", framework);
```


Expand All @@ -621,7 +621,7 @@ This method **return** an object containing the value.

*Example*
``` javascript
var cachedFramework = Lungo.Data.Cache.get("lungoFramework");
var cachedFramework = Lungo.Cache.get("lungoFramework");
//Result: {name: "Lungo", twitter: "lungojs"}
```

Expand All @@ -637,7 +637,7 @@ string: [OPTIONAL] Subkey in LungoJS Cache System.

*Example*
``` javascript
Lungo.Data.Cache.remove("lungoFramework");
Lungo.Cache.remove("lungoFramework");
```


Expand All @@ -652,7 +652,7 @@ This method **return** a boolean value which is true if the key is found

*Example*
``` javascript
Lungo.Data.Cache.exists("lungoFramework");
Lungo.Cache.exists("lungoFramework");
```


Expand Down Expand Up @@ -848,7 +848,7 @@ boolean: Boolean to show the percentage label.
<section id="main" data-transition="">
<article id="main-article" class="active list indented scroll">
<form>
<div class="progress">
<div id="prg-example" class="progress">
<span class="bar">
<span class="value"></span>
</span>
Expand All @@ -858,7 +858,7 @@ boolean: Boolean to show the percentage label.
</section>
```
``` javascript
Lungo.Element.progress("#progress-normal", 65, true);
Lungo.Element.progress("#prg-example", 65, true);
```
Expand Down
1 change: 0 additions & 1 deletion example/components/lungo.brownie
Submodule lungo.brownie deleted from 97078f
13 changes: 0 additions & 13 deletions example/components/lungo.icon/component.json

This file was deleted.

251 changes: 0 additions & 251 deletions example/components/lungo.icon/lungo.icon.css

This file was deleted.

10 changes: 5 additions & 5 deletions example/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>
<head>
<meta charset="utf-8">
<title>Brownie</title>
<title>Brownie - Lungo 2.2</title>
<meta name="description" content="">
<meta name="author" content="Javier Jiménez Villar (@soyjavi)">
<meta name="HandheldFriendly" content="True">
Expand Down Expand Up @@ -45,9 +45,9 @@
and (-webkit-device-pixel-ratio: 2)" rel="apple-touch-startup-image">

<!-- Main Stylesheet -->
<link rel="stylesheet" href="components/lungo.brownie/lungo.css">
<link rel="stylesheet" href="components/lungo.brownie/lungo.theme.css">
<link rel="stylesheet" href="components/lungo.icon/lungo.icon.css">
<link rel="stylesheet" href="../package/lungo/lungo.css">
<link rel="stylesheet" href="../package/lungo/lungo.theme.css">
<link rel="stylesheet" href="../package/lungo/lungo.icon.css">
<!-- App Stylesheet -->
<link rel="stylesheet" href="static/stylesheets/app.css">
</head>
Expand Down Expand Up @@ -124,7 +124,7 @@

<!-- Lungo dependencies -->
<script src="components/quojs/quo.js"></script>
<script src="components/lungo.brownie/lungo.debug.js"></script>
<script src="../package/lungo/lungo.js"></script>
<!-- LungoJS - Sandbox App -->
<script>
Lungo.init({
Expand Down

0 comments on commit 59dff91

Please sign in to comment.