[Spice-commits] 3 commits - .gitignore Makefile package.json package.json.in spice.css spice.html

[GitLab Mirror]

 .gitignore      |    1 +
 Makefile        |   30 +++++++++++++++++++++---------
 package.json.in |    2 +-
 spice.css       |    2 ++
 spice.html      |    9 ++++++---
 5 files changed, 31 insertions(+), 13 deletions(-)

New commits:
commit d75dc564401a4166f7d2c58185f0f5a8549259a8
Author: Jeremy White <jwhite at codeweavers.com>
Date:   Thu Feb 14 12:44:06 2019 -0600

    Hide the message console by default.

diff --git a/spice.css b/spice.css
index 4c61cb3..968ba16 100644
--- a/spice.css
+++ b/spice.css
@@ -103,6 +103,8 @@ body
     -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
     -moz-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
     box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.2);
+    /* We default the message box to hidden. */
+    display: none;
 }
 .spice-message p {
     margin-bottom: 0em;
diff --git a/spice.html b/spice.html
index d744ef9..177cfc2 100644
--- a/spice.html
+++ b/spice.html
@@ -176,7 +176,7 @@
             <label for="host">Host:</label> <input type='text' id='host' value='localhost'> <!-- localhost -->
             <label for="port">Port:</label> <input type='text' id='port' value='5959'>
             <label for="password">Password:</label> <input type='password' id='password' value=''>
-            <label for="show_console">Show console </label><input type="checkbox" id="show_console" value="1"" checked>
+            <label for="show_console">Show console </label><input type="checkbox" id="show_console" value="1"">
             <button id="connectButton">Start</button>
         </div>
 
commit a2d39ea67237e8bfe6524fbcad3df6a980365625
Author: Jeremy White <jwhite at codeweavers.com>
Date:   Thu Feb 14 11:36:21 2019 -0600

    Fix the console toggle in the new ES6 environment.
    
    Signed-off-by: Jeremy White <jwhite at codeweavers.com>

diff --git a/spice.html b/spice.html
index f9e1af4..d744ef9 100644
--- a/spice.html
+++ b/spice.html
@@ -146,8 +146,10 @@
                     m.style.display = 'none';
                 }
 
-                window.addEventListener('resize', handle_resize);
-                SpiceHtml5.resize_helper(sc);
+                window.addEventListener('resize', SpiceHtml5.handle_resize);
+                if (sc) {
+                    SpiceHtml5.resize_helper(sc);
+                }
             }
             /* SPICE port event listeners
             window.addEventListener('spice-port-data', function(event) {
@@ -162,6 +164,7 @@
             */
 
             document.getElementById('connectButton').onclick = connect;
+            document.getElementById('show_console').onchange = toggle_console;
         </script>
 
     </head>
@@ -173,7 +176,7 @@
             <label for="host">Host:</label> <input type='text' id='host' value='localhost'> <!-- localhost -->
             <label for="port">Port:</label> <input type='text' id='port' value='5959'>
             <label for="password">Password:</label> <input type='password' id='password' value=''>
-            <label for="show_console">Show console </label><input type="checkbox" id="show_console" value="1" onchange="toggle_console()" checked>
+            <label for="show_console">Show console </label><input type="checkbox" id="show_console" value="1"" checked>
             <button id="connectButton">Start</button>
         </div>
 
commit fa63a5392d5d06d4cd11c54848dafcdfd455bb55
Author: Jeremy White <jwhite at codeweavers.com>
Date:   Thu Feb 14 11:20:38 2019 -0600

    Generate package.json from the Makefile.
    
    Signed-off-by: Jeremy White <jwhite at codeweavers.com>

diff --git a/.gitignore b/.gitignore
index 33491a5..695d1d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 spice-html5.spec
+package.json
diff --git a/Makefile b/Makefile
index add307f..161a14a 100644
--- a/Makefile
+++ b/Makefile
@@ -26,23 +26,35 @@ endif
 
 source_for_rpm = $(HOME)/rpmbuild/SOURCES/spice-html5-$(version).tar.gz
 
-.PHONY: usage spice-html5.spec rpm tar gittar local git install
+.PHONY: usage spice-html5.spec package.json rpm tar gittar local git install
 
 usage:
 	@echo "This project does not normally need to be built.  See the README."
 	@echo " "
-	@echo "This Makefile is mostly used for creating RPM packages, which you"
-	@echo "can do by invoking 'make local' to use the current working directory,"
-	@echo "or 'make git' to use the latest git HEAD."
-	@echo "You can specify an alternate source tarball like this:"
-	@echo "  make source=/my/alternate/source local"
-	@echo "You can specifcy a specific git tag like this:"
-	@echo "  make tag=my_specific_tag git"
-	@echo "Results generally go in ~/rpmbuild"
+	@echo "This Makefile is used for creating RPM packages and the package.json file used by npm."
+	@echo " "
+	@echo "Building an rpm: "
+	@echo "  Invoke 'make local' to make an rpm with the current working directory,"
+	@echo "  or 'make git' to make an rpm with the latest git HEAD."
+	@echo "  You can specify an alternate source tarball like this:"
+	@echo "    make source=/my/alternate/source local"
+	@echo "  You can specify a specific git tag like this:"
+	@echo "    make tag=my_specific_tag git"
+	@echo "  Results generally go in ~/rpmbuild"
+	@echo " "
+	@echo "Preparing for an npm publish:"
+	@echo "    make package.json"
+	@echo "  where you can specify"
+	@echo "    make tag=my_specific_tag package.json"
+	@echo "  to prepare a particular release."
+
 
 spice-html5.spec:
 	sed -e "s/VERSION/$(version)/" < spice-html5.spec.in > spice-html5.spec
 
+package.json:
+	sed -e "s/VERSION/$(version)/" < package.json.in > package.json
+
 tar:
 	if [ "$(source)x" = "x" ] ; then \
 	    tar -czf $(source_for_rpm) --exclude=.git --transform='s!^!spice-html5-$(version)/!' * ; \
diff --git a/package.json b/package.json.in
similarity index 95%
rename from package.json
rename to package.json.in
index c77a0e8..ca56078 100644
--- a/package.json
+++ b/package.json.in
@@ -1,6 +1,6 @@
 {
   "name": "spice-html5",
-  "version": "0.1.8",
+  "version": "VERSION",
   "description": "Spice Javascript client",
   "main": "src/main.js",
   "scripts": {