updated advertisement information, now linking to the paid, ad-free Chrome App.

2012-08-31 21:55:19 +02:00 · 2012-08-31 21:55:19 +02:00 · b339a2b8c5
parent d12cde974a
commit b339a2b8c5
12 changed files with 98 additions and 24 deletions
--- a/app/chrome/index.html
+++ b/app/chrome/index.html
@ -36,7 +36,7 @@
    Copyright (C) 2011-2012 Jos de Jong, http://jsoneditoronline.org

    @author   Jos de Jong, <wjosdejong@gmail.com>
-    @date     2012-08-25
+    @date     2012-08-31
    -->

    <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.">
@ -101,7 +101,7 @@

 <div id="footer">
    <div id="footer-inner">
-        <a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 1.4.3</a>
+        <a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 1.4.4</a>
        &bull;
        <a href="../../changelog.txt" target="_blank" class="footer">Changelog</a>
        &bull;
--- a/app/chrome/manifest.json
+++ b/app/chrome/manifest.json
@ -1,7 +1,7 @@
 {
    "manifest_version": 2,
    "name": "JSON Editor",
-    "version": "1.4.3",
+    "version": "1.4.4",
    "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": {
        "launch": {
@ -13,5 +13,6 @@
        "128": "icon_128.png"
    },
    "permissions": [
-    ]
+    ],
+    "offline_enabled": true
 }
--- a/build.xml
+++ b/build.xml
@ -3,7 +3,7 @@
 <project name="jsoneditor-builder" default="main">
    <!-- the version number of must be updated here (according to changelog.txt) -->
    <property name="package" value="jsoneditor"/>
-    <property name="version" value="1.4.3"/>
+    <property name="version" value="1.4.4"/>

    <property name="root" location="" />
    <property name="lib" location="build/lib" />
--- a/build/lib/jsoneditor-1.4.4.min.zip
+++ b/build/lib/jsoneditor-1.4.4.min.zip
--- a/build/lib/jsoneditor-1.4.4.zip
+++ b/build/lib/jsoneditor-1.4.4.zip
--- a/changelog.txt
+++ b/changelog.txt
@ -2,6 +2,16 @@ JSON EDITOR ONLINE CHANGELOG
 http://jsoneditoronline.org


+2012-08-31, version 1.4.4
+
+- Changed: description of advertisement now gives information about the Chrome
+  App (without ads).
+- Changed: Chrome App is now configured to be available offline.
+- Fixed: When zooming your browser window, the fields/values did get wrapped
+  on Chrome (thanks Henri Gourvest), and on Firefox sometimes the jsoneditor
+  disappeared due to wrapping of hte interface contents .
+
+
 2012-08-25, version 1.4.3

 - Changed: changed code for the buttons to copy from formatter to editor and
--- a/index.html
+++ b/index.html
@ -104,9 +104,23 @@
        </script>

        <div id="ad" title="advertisement" >
-            <div class="hideAds">
-                (advertisement <a class="hideAds" href="javascript: main.hideAds();">hide</a>)<br>
+            <div id="adInfo">
+                ADVERTISEMENT<br>
+                <a class="adInfo" href="javascript: main.hideAds();">hide for now</a><br>
+                <div id="removeAds">
+                    <a class="adInfo" href="javascript: main.removeAds()">get rid of the ads</a>
+                </div>
+                <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"><!--
@ -128,7 +142,7 @@

 <div id="footer">
    <div id="footer-inner">
-        <a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 1.4.3</a>
+        <a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 1.4.4</a>
        &bull;
        <a href="changelog.txt" target="_blank" class="footer">Changelog</a>
        &bull;
--- a/interface/interface.css
+++ b/interface/interface.css
@ -87,37 +87,47 @@ a.header {
    color: white;
    text-decoration: none;
 }
-a.footer, a.hideAds {
+a.footer, a.adInfo {
    color: #BFBFBF;
    text-decoration: none;
 }
-a.footer:hover, a.hideAds:hover {
+a.footer:hover, a.adInfo:hover {
    color: red;
    text-decoration: underline;
 }

 #ad {
    float: left;
-    padding: 15px 0 15px 0;
+    padding: 40px 0 15px 0;
    position: relative;
 }

-div.hideAds {
+#adInfo {
    text-align: center;
    color: #BFBFBF;
    font-size: 10pt;
+    background-color: #f5f5f5;
+    line-height: 150%;

    position: absolute;
    left: 0;
-    top: 10px;
+    top: 15px;
    width: 160px;
+    padding-bottom: 5px;
 }

+#chromeAppInfo {
+    line-height: normal;
+    padding: 0 5px 20px 5px;
+}
+
+
+
 div.adSpace {
    height: 15px;
 }

-a.hideAds {
+a.adInfo {
    text-decoration: underline;
 }

--- a/interface/interface.js
+++ b/interface/interface.js
@ -26,7 +26,7 @@
 * Copyright (C) 2011-2012 Jos de Jong, http://jsoneditoronline.org
 *
 * @author  Jos de Jong, <wjosdejong@gmail.com>
- * @date    2012-08-25
+ * @date    2012-08-31
 */


@ -277,6 +277,7 @@ main.resize = function() {
    var domFormatter = document.getElementById('jsonformatter');
    var domSplitter = document.getElementById('splitter');
    var domAd = document.getElementById('ad');
+    var domAdInfo = document.getElementById('adInfo');

    var width = window.innerWidth || document.body.offsetWidth || document.documentElement.offsetWidth;
    var height = window.innerHeight || document.body.offsetHeight || document.documentElement.offsetHeight;
@ -292,9 +293,17 @@ main.resize = function() {
    domFormatter.style.width = (splitterLeft) + 'px';

    // resize editor
+    // the width has a -1 to prevent the width from being just half a pixel
+    // wider than the window, causing the content elements to wrap...
    domEditor.style.left = (splitterLeft + splitterWidth) + 'px';
-    domEditor.style.width = (width - splitterLeft - splitterWidth) + 'px';
+    domEditor.style.width = (width - splitterLeft - splitterWidth - 1) + 'px';
    //editor.onResize(); // TODO
+
+    // resize ad text
+    if (domAdInfo && domAd) {
+        var infoHeight = domAdInfo.clientHeight;
+        domAd.style.paddingTop = infoHeight + 'px';
+    }
 };

 main.errorFrame = undefined;
@ -357,3 +366,15 @@ main.hideAds = function() {
        main.resize();
    }
 };
+
+main.removeAds = function () {
+    var domRemoveAds = document.getElementById('removeAds');
+    var domChromeAppInfo = document.getElementById('chromeAppInfo');
+    if (domRemoveAds) {
+        domRemoveAds.style.display = 'none';
+    }
+    if (domChromeAppInfo) {
+        domChromeAppInfo.style.display = '';
+    }
+    main.resize();
+};
--- a/jsoneditor/jsoneditor.js
+++ b/jsoneditor/jsoneditor.js
@ -27,7 +27,7 @@
 * Copyright (c) 2011-2012 Jos de Jong, http://jsoneditoronline.org
 *
 * @author  Jos de Jong, <wjosdejong@gmail.com>
- * @date    2012-08-25
+ * @date    2012-08-31
 */


--- a/misc/todo.txt
+++ b/misc/todo.txt
@ -1,15 +1,19 @@
 JSON EDITOR ONLINE TODO
 http://jsoneditoronline.org

-
 ________________________________________________________________________

 VERSION 1: Basic functionality

-TODO
-make the css namings more efficient/shorter
+Bug: on Opera, you cannot double click to select a word in the field/value
+     editable div

-get the breaking of long words working correctly in Firefox
+Bug: get the breaking of long words working on Firefox an IE. Does not work for
+     a word like "blablablablablablablablablablablablablablablablablablablabla",
+     and in IE also not for urls.
+
+Bug: zooming on IE8 does not work nicely: width of the contents is not adjusted.
+     is fixed as soon as resize() is executed after zooming

 Get things working in IE7? maybe only a sizing problem (besides no JSON support)

--- a/test.html
+++ b/test.html
@ -105,9 +105,23 @@
        </script>

        <div id="ad" title="advertisement" >
-            <div class="hideAds">
-                (advertisement <a class="hideAds" href="javascript: main.hideAds();">hide</a>)<br>
+            <div id="adInfo">
+                ADVERTISEMENT<br>
+                <a class="adInfo" href="javascript: main.hideAds();">hide for now</a><br>
+                <div id="removeAds">
+                    <a class="adInfo" href="javascript: main.removeAds()">get rid of the ads</a>
+                </div>
+                <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"><!--
@ -131,7 +145,7 @@

 <div id="footer">
    <div id="footer-inner">
-        <a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 1.4.3</a>
+        <a href="http://jsoneditoronline.org" class="footer">JSON Editor Online 1.4.4</a>
        &bull;
        <a href="changelog.txt" target="_blank" class="footer">Changelog</a>
        &bull;