StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed the "hide ads" button. Not allowed by Google AdSense, sorry.

This commit is contained in:
josdejong 2013-02-20 08:04:18 +01:00
parent f2bd180790
commit d3f604a790
8 changed files with 22 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/chrome/manifest.json
View File

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "JSON Editor",
"version": "2.0.0",
"version": "2.0.1",
"description": "JSON Editor is a tool to view, edit, and format JSON. It shows your data in an editable treeview and in formatted plain text.",
"app": {
"urls": [

26
app/web/app.css
View File

@ -196,39 +196,15 @@ a.footer:hover, a.adInfo:hover {
#ad {
float: left;
padding: 40px 0 15px 0;
padding: 15px 0 15px 0;
position: relative;
}
#adInfo {
text-align: center;
color: #BFBFBF;
font-size: 10pt;
background-color: #f5f5f5;
line-height: 150%;
position: absolute;
left: 0;
top: 15px;
width: 160px;
padding-bottom: 5px;
}
#chromeAppInfo {
line-height: normal;
padding: 0 5px 20px 5px;
}
div.adSpace {
height: 15px;
}
a.adInfo {
text-decoration: underline;
}
div.error, div.notification {
border-radius: 2px;
padding: 5px;

13
app/web/app.js
View File

@ -26,7 +26,7 @@
* Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <wjosdejong@gmail.com>
* @date 2013-02-09
* @date 2013-02-20
*/
@ -324,14 +324,3 @@ app.resize = function() {
domAd.style.paddingTop = infoHeight + 'px';
}
};
/**
* Hide the advertisement
*/
app.hideAds = function() {
var domAd = document.getElementById("ad");
if (domAd) {
domAd.parentNode.removeChild(domAd);
app.resize();
}
};

14
app/web/index.html
View File

@ -37,7 +37,7 @@
Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org
@author Jos de Jong, <wjosdejong@gmail.com>
@date 2013-02-09
@date 2013-02-20
-->
<meta name="description" content="JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in formatted plain text.">
@ -133,14 +133,7 @@
app.resize();
</script>
<div id="ad" title="advertisement" >
<div id="adInfo">
ADVERTISEMENT<br>
<a class="adInfo" href="javascript: app.hideAds();">hide for now</a><br>
</div>
<div class="adSpace"></div>
<div id="ad">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7938810169574141";
/* jsoneditoronline_160x600 */
@ -153,14 +146,13 @@
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</div>
</div>
<div id="footer">
<div id="footer-inner">
<a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 2.0.0</a>
<a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 2.0.1</a>
&bull;
<a href="changelog.txt" target="_blank" class="footer">Changelog</a>
&bull;

20
app/web/test.html
View File

@ -36,7 +36,7 @@
Copyright (C) 2011-2013 Jos de Jong, http://jsoneditoronline.org
@author Jos de Jong, <wjosdejong@gmail.com>
@date 2013-02-09
@date 2013-02-20
-->
<meta name="description" content="JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in formatted plain text.">
@ -160,22 +160,6 @@
</script>
<div id="ad" title="advertisement" >
<div id="adInfo">
ADVERTISEMENT<br>
<a class="adInfo" href="javascript: app.hideAds();">hide for now</a><br>
<div id="chromeAppInfo" style='display: none;'>
<br>If you want to get rid of the ads,
you can buy the Chrome App.
This will give you the JSON Editor without ads,
offline available, always up to date, and just one click away.<br>
<a class="adInfo"
href="https://chrome.google.com/webstore/detail/gckckcmcgknlbcmnpgijfmpppiplijgn"
target="_blank">Click here for more info</a>
</div>
</div>
<div class="adSpace"></div>
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7938810169574141";
/* jsoneditoronline_160x600 */
@ -197,7 +181,7 @@
<div id="footer">
<div id="footer-inner">
<a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 2.0.0</a>
<a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 2.0.1</a>
&bull;
<a href="../../changelog.txt" target="_blank" class="footer">Changelog</a>
&bull;

2
build.xml
View File

@ -2,7 +2,7 @@
<project name="jsoneditor-builder" default="main">
<!-- the version number of must be updated here (according to changelog.txt) -->
<property name="version" value="2.0.0"/>
<property name="version" value="2.0.1"/>
<!-- compression tools -->
<property name="compressor" value="tools/yuicompressor-2.4.7.jar" />

6
changelog.txt
View File

@ -3,6 +3,12 @@
http://jsoneditoronline.org
## 2013-02-20, version 2.0.1
- Fixed undefined variable in the redo method.
- Removed the "hide ads" button. Not allowed by Google AdSense, sorry.
## 2013-02-09, version 2.0.0
- Implemented a context menu, replacing the action buttons on the right side of

2
jsoneditor/js/module.js
View File

@ -27,7 +27,7 @@
* Copyright (c) 2011-2013 Jos de Jong, http://jsoneditoronline.org
*
* @author Jos de Jong, <wjosdejong@gmail.com>
* @date 2013-01-24
* @date 2013-02-20
*/
(function () {