Skip to content

Commit cceb685

Browse files
pikockpikock
committed
fix localstorage
1 parent a9d964b commit cceb685

2 files changed

Lines changed: 78 additions & 106 deletions

File tree

‎app/index.html‎

Lines changed: 62 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,34 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="fragment" content="!">
6-
<title>Bootstrap Magic : Generate your own bootstrap theme quickly and easily</title>
7-
<meta name="description" content="Awesome features like contextual typeahead and colorpicker help you make your custom bootstrap 3 themes quickly and easily." />
86
<link rel="stylesheet" href="css/app.css">
97
<style>
108
[ng-cloak] {
119
display: none;
1210
}
1311
</style>
1412
<script type="text/javascript">
15-
less = {
13+
14+
less = {
1615
env: "development", // or "production"
1716
async: false, // load imports async
18-
fileAsync: false, // load imports async when in a page under
17+
fileAsync: false, // load imports async when in a page under
1918
// a file protocol
20-
poll: 1000, // when in watch mode, time in ms between polls
19+
poll: 3000, // when in watch mode, time in ms between polls
2120
functions: {}, // user functions, keyed by name
2221
dumpLineNumbers: "comments", // or "mediaQuery" or "all"
23-
relativeUrls: false,// whether to adjust url's to be relative
24-
// if false, url's are already relative to the
25-
// entry less file
26-
// rootpath: ":/a.com/"// a path to add on to the start of every url
27-
//resource
22+
relativeUrls: false,
23+
24+
// whether to adjust url's to be relative
25+
// if false, url's are already relative to the
26+
// entry less file
27+
28+
// rootpath: "/tutu/"
29+
// rootpath: "/github/variables-bootstrap-angularJS-editor/"
30+
// a path to add on to the start of every url
31+
//resource
2832
};
29-
33+
3034
</script>
3135
<script>
3236
// include angular loader, which allows the files to load in any order
@@ -54,7 +58,7 @@
5458

5559
// load all of the dependencies asynchronously.
5660
$script([
57-
'lib/less/less-1.4.1.min.js',
61+
'lib/less/less-1.3.3.min.js',
5862
'lib/jquery/jquery-1.8.3.min.js'
5963
], function() {
6064
$script([
@@ -77,24 +81,12 @@
7781

7882

7983
</script>
80-
<title>Bootstrap Magic : Generate simply your own bootstrap 3 theme </title>
81-
<meta name="description" content="Awesome features like contextual typeahead and colorpicker to make smooth bootstrap 3 theme faster." />
84+
<title>Bootstrap Magic : Generate simply your own bootstrap theme</title>
85+
<meta name="description" content="Awesome features like contextual typeahead and colorpicker to make smooth bootstrap theme faster." />
8286
<link id="twitterBootstrapLess" rel="stylesheet/less" href="../twitter-bootstrap/less/bootstrap.less">
83-
<!-- <link id="twitterResponsiveLess" rel="stylesheet/less" href="../twitter-bootstrap/less/responsive.less"> -->
84-
85-
86-
<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
87-
<script>
88-
WebFont.load({
89-
google: {
90-
families: ['Droid Sans', 'Droid Serif']
91-
}
92-
});
93-
</script>
94-
95-
87+
<link id="twitterResponsiveLess" rel="stylesheet/less" href="../twitter-bootstrap/less/responsive.less">
9688
<script type="text/javascript">
97-
89+
9890
var _gaq = _gaq || [];
9991
_gaq.push(['_setAccount', 'UA-37710723-1']);
10092
_gaq.push(['_trackPageview']);
@@ -109,81 +101,49 @@
109101
</head>
110102
<body data-ng-cloak>
111103
<div class="protected">
112-
<nav class="navbar-inverse navbar-default" role="navigation">
113-
<!-- Brand and toggle get grouped for better mobile display -->
114-
<div class="navbar-header">
115-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
116-
<span class="sr-only">Toggle navigation</span>
117-
<span class="icon-bar"></span>
118-
<span class="icon-bar"></span>
119-
<span class="icon-bar"></span>
120-
</button>
121-
<a class="navbar-brand" href="../index.html" title="Bootrstrap Magic written in AngularJS">Bootstrap Magic</a>
122-
</div>
123-
124-
<!-- Collect the nav links, forms, and other content for toggling -->
125-
<div class="collapse navbar-collapse navbar-ex1-collapse">
126-
<ul class="nav navbar-nav">
127-
<li><a href="../index.html" title="bootstrap 3 themes generator presentation">Home</a></li>
128-
<li class="divider-vertical"></li>
129-
<li ><a href="index.html#!/editor" title="bootstrap 3 themes generator">Editor</a></li>
130-
<li class="divider-vertical"></li>
131-
<li ><a href="index.html#!/create-website-pikock" title="create website easily">Create your website with Pikock</a></li>
132-
<li class="divider-vertical"></li>
133-
</ul>
134-
135-
<ul class="nav navbar-nav navbar-right socialButtons">
136-
<li>
137-
<div class="fb-like" data-href="http://pikock.github.io/bootstrap-magic/" data-send="false" data-layout="button_count" data-width="50" data-show-faces="false" data-action="like"></div>
138-
</li>
139-
<li class="twitter">
140-
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://pikock.github.io/bootstrap-magic/" data-text="Bootstrap Magic feat Bootstrap 3 : Awesome theme generator with live preview" data-lang="en" data-hashtags="bootstrap,angularjs">Tweeter</a>
141-
</li>
142-
<li><div class="g-plusone" data-size="medium" data-href="http://pikock.github.io/bootstrap-magic/"></div></li>
143-
</ul>
144-
145-
</div><!-- /.navbar-collapse -->
146-
</nav>
104+
<div class=" navbar navbar-static-top navbar-inverse" id="menuTop">
105+
<div class="navbar-inner">
106+
<div class="container">
107+
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
108+
<span class="icon-bar"></span>
109+
<span class="icon-bar"></span>
110+
<span class="icon-bar"></span>
111+
</a>
112+
<a class="brand" href="../index.html" title="Bootrstrap Magic written in AngularJS">Bootstrap Magic</a>
113+
<ul class="nav">
114+
<li><a href="../index.html" title="bootstrap themes generator presentation">Intro</a></li>
115+
<li class="divider-vertical"></li>
116+
<li ><a href="index.html#!/editor" title="bootstrap themes generator">Editor</a></li>
117+
<li class="divider-vertical"></li>
118+
</ul>
119+
</div>
120+
</div>
121+
</div>
147122
</div>
148123

149-
<div class="protected">
150-
<div class="isViewLoading" ng-show="isViewLoading">
151-
<h1>It's gonna be magic... wait for it...</h1>
152-
<div class="loader">
153-
<div class="bar1"></div>
154-
<div class="bar2"></div>
155-
<div class="bar3"></div>
156-
<div class="bar4"></div>
157-
<div class="bar5"></div>
158-
<div class="bar6"></div>
159-
<div class="bar7"></div>
160-
<div class="bar8"></div>
161-
</div>
162-
</div>
163-
</div>
164-
165-
<div ng-view></div>
166-
167-
<div id="fb-root"></div>
168-
<script type="text/javascript">
169-
(function(d, s, id) {
170-
var js, fjs = d.getElementsByTagName(s)[0];
171-
if (d.getElementById(id)) return;
172-
js = d.createElement(s); js.id = id;
173-
js.src = "//connect.facebook.net/fr_FR/all.js#xfbml=1&appId=239545502808545";
174-
fjs.parentNode.insertBefore(js, fjs);
175-
}(document, 'script', 'facebook-jssdk'));
176-
177-
window.___gcfg = {lang: 'fr'};
178-
179-
(function() {
180-
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
181-
po.src = 'https://apis.google.com/js/plusone.js';
182-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
183-
})();
184-
185-
!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="https://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");
186-
</script>
187-
124+
<div class="container">
125+
<div class="isViewLoading" ng-show="isViewLoading">
126+
<h1>It's gonna be magic... wait for it...</h1>
127+
<div class="loader">
128+
<div class="bar1"></div>
129+
<div class="bar2"></div>
130+
<div class="bar3"></div>
131+
<div class="bar4"></div>
132+
<div class="bar5"></div>
133+
<div class="bar6"></div>
134+
<div class="bar7"></div>
135+
<div class="bar8"></div>
136+
</div>
137+
</div>
138+
<div ng-view></div>
139+
140+
</div>
141+
142+
<!--<footer>
143+
<div class="container">
144+
<p>Variables Bootstrap AngularJS Editor: v<span app-version></span></p>
145+
</div>
146+
</footer>-->
147+
188148
</body>
189149
</html>

‎app/js/controllers.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,16 @@ function LessCtrl($scope, $http, ap_less, $timeout) {
66
$scope.fonts = {};
77
var initLessVariables = function () {
88
$http.get('less/variables.json').success(function(data) {
9+
10+
if (window.localStorage) {
11+
for (var key in window.localStorage) {
12+
var url = "http://pikock.github.io/bootstrap-magic/twitter-bootstrap/less/bootstrap.less:timestamp"
13+
if (key == url) {
14+
delete window.localStorage[key];
15+
};
16+
}
17+
};
18+
919
$scope.variables = data;
1020
$timeout(function() {
1121
$scope.applyLess(false);
@@ -20,10 +30,12 @@ function LessCtrl($scope, $http, ap_less, $timeout) {
2030
$colorpicker.colorpicker().on('changeColor', function(ev){
2131
var scope = angular.element(this).scope();
2232
scope.variable.value = ev.color.toHex();
23-
24-
if ($scope.autoapplyless){
25-
$scope.autoApplyLess();
26-
}
33+
34+
$timeout(function() {
35+
if ($scope.autoapplyless){
36+
$scope.autoApplyLess();
37+
}
38+
}, 500);
2739
});
2840

2941
$('.lessVariable').each( function(index){

0 commit comments

Comments
 (0)