Skip to content

Commit

Permalink
Remove the tag cloud and change the "home" section back to "Instagram…
Browse files Browse the repository at this point in the history
… top pictures";

Delete waypoints.min.js because it is not used anymore;
  • Loading branch information
barriosnahuel committed Nov 5, 2013
1 parent 7dd9cb3 commit 725b58c
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 597 deletions.
13 changes: 1 addition & 12 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@

<ul class="nav navbar-nav">
<li class="active st-topNews-menuItem">
<a href="#home" data-toggle="tab">
<span class="glyphicon glyphicon-home"></span>
</a>
</li>
<li class="st-topNews-menuItem">
<a href="#top" data-toggle="tab">
<span class="glyphicon glyphicon-star"></span>Top
</a>
Expand Down Expand Up @@ -133,12 +128,7 @@
<div class="row">
<div class="col-md-12">
<div class="tab-content">
<section class="row tab-pane fade in active" id="home">
<div id="tagcloud">
<ul></ul>
</div>
</section>
<section class="row tab-pane fade in" id="top">
<section class="row tab-pane fade in active" id="top">
<div id="instagramPopularPhotos">
<h3>
<a href="http://instagram.com/" target="_blank" title="Navigate to Instagram official site">Instagram</a>
Expand Down Expand Up @@ -256,7 +246,6 @@ <h4 class="modal-title">Facebook login</h4>
<script type="text/javascript" src="js/lib/codebird-js-2.4.1/codebird.js"></script>
<script type="text/javascript" src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/lib/jsrender.js"></script>
<script type="text/javascript" src="js/lib/tagcloud.jquery.min.js"></script>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript">google.load("feeds", "1");</script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery.isotope/1.5.25/jquery.isotope.min.js"></script>
Expand Down
65 changes: 2 additions & 63 deletions js/app/ui/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,6 @@ app.ui.index = (function () {
});
}

var cloudList = home.$tagCloud.find('>ul');
cloudList.append('<li><a href="' + topicNameElementSelector + '">' + topicName + '</a></li>');

$(cloudList.find('>li>a[href=' + topicNameElementSelector + ']')).on('click', {containerSelector: containerSelector}, onMenuItemSelected);

$(containerSelector + ' a[href=' + topicNameElementSelector + ']').on('click', {containerSelector: containerSelector},
onMenuItemSelected);

Expand Down Expand Up @@ -387,7 +382,7 @@ app.ui.index = (function () {
};
}());

var init = function (callback) {
var init = function () {

var findLocalTrends = function () {

Expand All @@ -408,8 +403,6 @@ app.ui.index = (function () {
createEntry('#localTrends', localTrends[index].name, false);
}

home.init(undefined);

$localTrendsLIParent = $('#localTrends').parent();
$dropdownLabel = $localTrendsLIParent.find('>a');
$dropdownLabel.html(countryName + $dropdownLabel.html());
Expand Down Expand Up @@ -459,8 +452,6 @@ app.ui.index = (function () {
createEntry('#globalTrends', globalTrends[relativeGlobalTrendsIndex].name, false);
}

home.init(undefined);

$('#globalTrends').parent().show();
};

Expand All @@ -475,8 +466,6 @@ app.ui.index = (function () {
for (relativeGlobalTrendsIndex; relativeGlobalTrendsIndex < globalTrends.length; relativeGlobalTrendsIndex++) {
createEntry('#globalTrends', globalTrends[relativeGlobalTrendsIndex].name, false);
}

home.init(undefined);
};

// End method definitions
Expand All @@ -486,8 +475,6 @@ app.ui.index = (function () {
findLocalTrends();
$.when(app.service.socialNetworks.twitter.findGlobalTrends()).done(onSuccessTwitterGlobalSearch);
$.when(app.service.google.search.findTrends(undefined)).done(onSuccessGoogleGlobalSearch);

callback();
};

return {
Expand All @@ -496,54 +483,6 @@ app.ui.index = (function () {
};
}());

var home = (function () {
var $tagCloud = $('#tagcloud');

var init = function (callback) {
var settings = {
//height of sphere container
height: 400,
//width of sphere container
width: 400,
//radius of sphere
radius: 150,
//rotation speed
speed: 0.5,
//sphere rotations slower
slower: 0.9,
//delay between update position
timer: 10,
//dependence of a font size on axis Z
fontMultiplier: 15,
//tag css stylies on mouse over
hoverStyle: {
border: 'none',
color: '#0b2e6f'
},
//tag css stylies on mouse out
mouseOutStyle: {
border: '',
color: ''
}
};
$tagCloud.tagoSphere(settings);

if (callback) {
callback();
}
};

var show = function () {
showSection('home');
};

return {
$tagCloud: $tagCloud,
init: init,
show: show
};
}());

var top = (function () {
var init = function () {
app.service.socialNetworks.instagram.findTrends(function (data) {
Expand All @@ -568,7 +507,7 @@ app.ui.index = (function () {
}());

var init = function () {
menu.init(home.init.bind(null, home.show));
menu.init();
top.init();
};

Expand Down
117 changes: 0 additions & 117 deletions js/lib/tagcloud.jquery.min.js

This file was deleted.

Loading

0 comments on commit 725b58c

Please sign in to comment.