cyberweb 0.8.17 → 0.9.31

data/lib/cyberweb/javascript/javascript_clock.rb

@@ -17,8 +17,11 @@ module Cyberweb
       css_class  = '',
       the_id     = 'Clock',
       css_style  = '',
-      javascript = ''
+      javascript = '',
+      &block
     )
+    images_right = nil # This allows the user to specify images to the right side of the clock.
+    use_this_css_class_for_the_actual_clock = ''
     if css_class.is_a?(Hash)
       # ===================================================================== #
       # === :css_style
@@ -38,17 +41,47 @@ module Cyberweb
     # ======================================================================= #
     if block_given?
       yielded = yield
-      case yielded
       # ===================================================================== #
-      # === :larger_font_size
-      #
-      # For some reason this does not seem to work.
+      # === First handle Hashes
       # ===================================================================== #
-      when :larger_font_size
-        if css_style.frozen?
-          css_style = css_style.to_s.dup
+      if yielded.is_a?(Hash)
+        # =================================================================== #
+        # === :inner_css_class
+        # =================================================================== #
+        if yielded.has_key? :inner_css_class
+          use_this_css_class_for_the_actual_clock = yielded.delete(:inner_css_class)
+        end
+        # =================================================================== #
+        # === :images_right
+        #
+        # The following species images to be displayed right to the small
+        # clock. Allowed images are currently only those that are part
+        # of the cyberweb project itself.
+        # =================================================================== #
+        if yielded.has_key? :images_right
+          images_right = yielded.delete(:images_right)
+        end
+      # ===================================================================== #
+      # === Next handle Symbols
+      # ===================================================================== #
+      elsif yielded.is_a?(Symbol)
+        case yielded
+        # =================================================================== #
+        # === :inner_css_class
+        # =================================================================== #
+        when :inner_css_class
+          use_this_css_class_for_the_actual_clock = yielded.delete(:inner_css_class)
+        # =================================================================== #
+        # === :larger_font_size
+        #
+        # For some reason this does not seem to work.
+        # =================================================================== #
+        when :larger_font_size
+          if css_style.frozen?
+            css_style = css_style.to_s.dup
+          end
+          css_style << '; font-size: larger;'
         end
-        css_style << '; font-size: larger;'
       end
     end
     self.javascript '
@@ -89,15 +122,25 @@ function kill_the_clock()  { if(clock_id) { clearTimeout(clock_id); clock_id = 0
         )
       end
       self.javascript 'start_the_clock()' # Start our clock here.
-      # ===================================================================== # 
+      # ===================================================================== #
+      # === The actual clock
+      # 
       # Give the form the name "form_displaying_a_simple_clock" next.
       # ===================================================================== #
-      e '<form name="form_displaying_a_simple_clock">'
+      ee '<form name="form_displaying_a_simple_clock"">'+N
         input(
-          :text,'','pad5px s8px','Time',
+          :text,
+          '',
+          ('pad5px s8px '+use_this_css_class_for_the_actual_clock).strip,
+          'Time',
           css_style,
           'c'
         )
+        if images_right and !images_right.empty?
+          images_right.each {|entry|
+            dimg(entry,'marl8px')
+          }
+        end
       cform
     }
   end; alias javascript_clock display_clock # === javascript_clock

data/lib/cyberweb/javascript_code/custom_functions.js

@@ -13,6 +13,24 @@ function change_the_colour_to(
   document.getElementById(work_on_this_id).style.color = this_colour;
 }
 
+/*
+ * === copy_to_clipboard()
+ *
+ * This function allows the user to copy onto the clipboard.
+ */
+function copy_to_clipboard(i) {
+  navigator.clipboard && navigator.clipboard.writeText(i);
+}
+
+/*
+ * === return_random_colour()
+ *
+ * This function will return a random colour.
+ */
+function return_random_colour() {
+  return Math.floor(Math.random() * 0xffffff).toString(16);
+}
+
 /*
  * === show_source()
  *
@@ -80,28 +98,6 @@ function set_background_color(new_colour, which_element)
   which_element.style.backgroundColor = new_colour;
 }
 
-function toggle(target_id)
-{
-  status = document.getElementById(target_id).style.visibility
-
-  if (status == 'hidden') {
-    reveal(target_id);
-  }
-  else
-  {
-    hide(target_id);
-  }
-}
-
-/*
- * === toggle_visibility()
- *
- */
-function toggle_visibility(id)
-{
-  toggle(id)
-}
-
 /*
  * === set_visibility()
  *
@@ -280,7 +276,7 @@ function upcase(x)
 /*
  * === popup()
  *
- * An alias to alert.
+ * popup() is a simple alias over alert().
  *
  * Usage examples:
  *
@@ -314,6 +310,12 @@ function array_includes(this_array, key_string) {
  *
  * This uses the so called "spread operator" in JavaScript.
  *
+ * The spread (...) syntax works on iterables, such as
+ * an Array or a String - also known as splat in ruby
+ * or varargs in Java. It allows us to pass in zero
+ * or more arguments to a function call.
+ *
+ *
  * Usage example:
  *
  *   pp(['abc','def','ghi'])
@@ -321,4 +323,52 @@ function array_includes(this_array, key_string) {
  */
 function pp(i) {
   console.log(...i);
+}
+/*
+ * clog()
+ */
+function clog(i) {
+  console.log(...i)
+}
+
+/*
+ * append_this_to_that_array()
+ */
+function append_this_to_that_array(this_element, that_array) {
+  that_array.push(this_element)
+}
+
+/*
+ * return_cookie()
+ */
+function return_cookie() {
+  return document.cookie
+}
+
+/*
+ * toggle()
+ *
+ * This function can be used to toggle visibility of elements based
+ * on their ID.
+ */
+function toggle(target_id)
+{
+  var target_element = document.getElementById(target_id)
+  var display_status = target_element.style.display
+
+  if (display_status === "none") {
+    target_element.style.display = "block"
+  } else {
+    target_element.style.display = "none"
+  }
+
+}
+
+/*
+ * === toggle_visibility()
+ *
+ */
+function toggle_visibility(id)
+{
+  toggle(id)
 }

data/lib/cyberweb/javascript_code/html_colours.js

@@ -1,17 +1,17 @@
 /*
  * This Array could be obtained via:
  *
-
-  <script src="/home/x/programming/ruby/src/cyberweb/lib/cyberweb/javascript_code/html_colours.js">
-  </script>
-
-Or in a relative way:
-
-  <script src="../../../lib/cyberweb/javascript_code/html_colours.js"></script>
-
+ *   script src="/home/x/programming/ruby/src/cyberweb/lib/cyberweb/javascript_code/html_colours.js"
+ *   /script
+ *
+ * Or in a relative way:
+ *
+ *   script src="../../../lib/cyberweb/javascript_code/html_colours.js"></script
+ *
  */
 
-let HTML_COLOURS = ['aliceblue',
+let HTML_COLOURS = [
+ 'aliceblue',
  'antiquewhite',
  'aqua',
  'aquamarine',

data/lib/cyberweb/javascript_code/jquery/{jquery-3.6.1.js → jquery-3.6.3.js}

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v3.6.1
+ * jQuery JavaScript Library v3.6.3
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2022-08-26T17:52Z
+ * Date: 2022-12-20T21:28Z
  */
 ( function( global, factory ) {
 
@@ -151,7 +151,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.6.1",
+	version = "3.6.3",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -522,14 +522,14 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.3.6
+ * Sizzle CSS Selector Engine v2.3.9
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2021-02-16
+ * Date: 2022-12-19
  */
 ( function( window ) {
 var i,
@@ -879,6 +879,27 @@ function Sizzle( selector, context, results, seed ) {
 				}
 
 				try {
+
+					// `qSA` may not throw for unrecognized parts using forgiving parsing:
+					// https://drafts.csswg.org/selectors/#forgiving-selector
+					// like the `:has()` pseudo-class:
+					// https://drafts.csswg.org/selectors/#relational
+					// `CSS.supports` is still expected to return `false` then:
+					// https://drafts.csswg.org/css-conditional-4/#typedef-supports-selector-fn
+					// https://drafts.csswg.org/css-conditional-4/#dfn-support-selector
+					if ( support.cssSupportsSelector &&
+
+						// eslint-disable-next-line no-undef
+						!CSS.supports( "selector(:is(" + newSelector + "))" ) ) {
+
+						// Support: IE 11+
+						// Throw to get to the same code path as an error directly in qSA.
+						// Note: once we only support browser supporting
+						// `CSS.supports('selector(...)')`, we can most likely drop
+						// the `try-catch`. IE doesn't implement the API.
+						throw new Error();
+					}
+
 					push.apply( results,
 						newContext.querySelectorAll( newSelector )
 					);
@@ -1174,6 +1195,31 @@ setDocument = Sizzle.setDocument = function( node ) {
 			!el.querySelectorAll( ":scope fieldset div" ).length;
 	} );
 
+	// Support: Chrome 105+, Firefox 104+, Safari 15.4+
+	// Make sure forgiving mode is not used in `CSS.supports( "selector(...)" )`.
+	//
+	// `:is()` uses a forgiving selector list as an argument and is widely
+	// implemented, so it's a good one to test against.
+	support.cssSupportsSelector = assert( function() {
+		/* eslint-disable no-undef */
+
+		return CSS.supports( "selector(*)" ) &&
+
+			// Support: Firefox 78-81 only
+			// In old Firefox, `:is()` didn't use forgiving parsing. In that case,
+			// fail this test as there's no selector to test against that.
+			// `CSS.supports` uses unforgiving parsing
+			document.querySelectorAll( ":is(:jqfake)" ) &&
+
+			// `*` is needed as Safari & newer Chrome implemented something in between
+			// for `:has()` - it throws in `qSA` if it only contains an unsupported
+			// argument but multiple ones, one of which is supported, are fine.
+			// We want to play safe in case `:is()` gets the same treatment.
+			!CSS.supports( "selector(:is(*,:jqfake))" );
+
+		/* eslint-enable */
+	} );
+
 	/* Attributes
 	---------------------------------------------------------------------- */
 
@@ -1440,6 +1486,17 @@ setDocument = Sizzle.setDocument = function( node ) {
 		} );
 	}
 
+	if ( !support.cssSupportsSelector ) {
+
+		// Support: Chrome 105+, Safari 15.4+
+		// `:has()` uses a forgiving selector list as an argument so our regular
+		// `try-catch` mechanism fails to catch `:has()` with arguments not supported
+		// natively like `:has(:contains("Foo"))`. Where supported & spec-compliant,
+		// we now use `CSS.supports("selector(:is(SELECTOR_TO_BE_TESTED))")`, but
+		// outside that we mark `:has` as buggy.
+		rbuggyQSA.push( ":has" );
+	}
+
 	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
 	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
 
@@ -1452,7 +1509,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// As in, an element does not contain itself
 	contains = hasCompare || rnative.test( docElem.contains ) ?
 		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
+
+			// Support: IE <9 only
+			// IE doesn't have `contains` on `document` so we need to check for
+			// `documentElement` presence.
+			// We need to fall back to `a` when `documentElement` is missing
+			// as `ownerDocument` of elements within `<template/>` may have
+			// a null one - a default behavior of all modern browsers.
+			var adown = a.nodeType === 9 && a.documentElement || a,
 				bup = b && b.parentNode;
 			return a === bup || !!( bup && bup.nodeType === 1 && (
 				adown.contains ?
@@ -2242,7 +2306,7 @@ Expr = Sizzle.selectors = {
 			return elem.nodeName.toLowerCase() === "input" &&
 				elem.type === "text" &&
 
-				// Support: IE<8
+				// Support: IE <10 only
 				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
 				( ( attr = elem.getAttribute( "type" ) ) == null ||
 					attr.toLowerCase() === "text" );
@@ -6608,17 +6672,37 @@ function curCSS( elem, name, computed ) {
 	//   .css('filter') (IE 9 only, trac-12537)
 	//   .css('--customProperty) (gh-3144)
 	if ( computed ) {
-		ret = computed.getPropertyValue( name ) || computed[ name ];
 
-		// trim whitespace for custom property (issue gh-4926)
-		if ( isCustomProp ) {
+		// Support: IE <=9 - 11+
+		// IE only supports `"float"` in `getPropertyValue`; in computed styles
+		// it's only available as `"cssFloat"`. We no longer modify properties
+		// sent to `.css()` apart from camelCasing, so we need to check both.
+		// Normally, this would create difference in behavior: if
+		// `getPropertyValue` returns an empty string, the value returned
+		// by `.css()` would be `undefined`. This is usually the case for
+		// disconnected elements. However, in IE even disconnected elements
+		// with no styles return `"none"` for `getPropertyValue( "float" )`
+		ret = computed.getPropertyValue( name ) || computed[ name ];
 
-			// rtrim treats U+000D CARRIAGE RETURN and U+000C FORM FEED
+		if ( isCustomProp && ret ) {
+
+			// Support: Firefox 105+, Chrome <=105+
+			// Spec requires trimming whitespace for custom properties (gh-4926).
+			// Firefox only trims leading whitespace. Chrome just collapses
+			// both leading & trailing whitespace to a single space.
+			//
+			// Fall back to `undefined` if empty string returned.
+			// This collapses a missing definition with property defined
+			// and set to an empty string but there's no standard API
+			// allowing us to differentiate them without a performance penalty
+			// and returning `undefined` aligns with older jQuery.
+			//
+			// rtrimCSS treats U+000D CARRIAGE RETURN and U+000C FORM FEED
 			// as whitespace while CSS does not, but this is not a problem
 			// because CSS preprocessing replaces them with U+000A LINE FEED
 			// (which *is* CSS whitespace)
 			// https://www.w3.org/TR/css-syntax-3/#input-preprocessing
-			ret = ret.replace( rtrimCSS, "$1" );
+			ret = ret.replace( rtrimCSS, "$1" ) || undefined;
 		}
 
 		if ( ret === "" && !isAttached( elem ) ) {

data/lib/cyberweb/predefined_and_freeform_methods/predefined_methods.rb

@@ -76,111 +76,6 @@ module PredefinedMethods # === Cyberweb::PredefinedMethods
     h2(result, optional_css) # Or H[:question].
   end; alias question frage # === question
 
-  # ========================================================================= #
-  # === Cmd2
-  # ========================================================================= #
-  class Cmd2
-
-    # ======================================================================= #
-    # === Cmd2.append
-    #
-    # This method can be used to append to the H[:command2] hash.
-    #
-    # The ' ' will be mandatory for now.
-    # ======================================================================= #
-    def self.append(i)
-      ::Cyberweb.internal_hash?[:cmd2] << " #{i}"
-    end; self.instance_eval { alias append_this_css append } # === Cmd2.append_this_css
-
-  end
-
-  # ========================================================================= #
-  # === CMD2
-  # ========================================================================= #
-  # CMD2 = command2? # A reference to the above.
-
-  # ========================================================================= #
-  # === command3?
-  # ========================================================================= #
-  def command3?
-    ::Cyberweb.internal_hash?[:cmd3] # We delegate towards HASH_CSS_CLASS_TO_USE here.
-  end
-
-  # ========================================================================= #
-  # === cmd2
-  #
-  # This method will require that the method command2? will work. 
-  # ========================================================================= #
-  def cmd2(
-      i           = '',
-      optional_id = ''
-    )
-    padl2em(i, command2?, optional_id) # The second argument here is the id.
-  end; alias rc2      cmd2 # === rc2
-       alias command2 cmd2 # === command2
-
-  # ========================================================================= #
-  # === cmdbold
-  # ========================================================================= #
-  def cmdbold(i = '')
-    cmd(i, 'BOLD mars1em')
-  end
-
-  # ========================================================================= #
-  # === cmd                                                         (cmd tag)
-  #
-  # This is a predefined method, called cmd().
-  #
-  # It will call the method css.optional, which is defined in the file 
-  # cyberweb/toplevel_methods/css.rb.
-  #
-  # By default, the return value obtained from css.optional corresponds to
-  # 'marl1em BO' - in other words, be bold and use a "margin-left: 1em"
-  # style in CSS.
-  #
-  # Further usage example:
-  #
-  #   css.optional = 'oki dokie'
-  #   cmd 'Test'
-  #   css.optional = 'bla'
-  #   cmd 'Test'
-  #
-  # ========================================================================= #
-  def cmd(
-      i                  = '',
-      css_class          = cmd?, # <- This used to be css.optional but I am not sure if we will keep on using css.optional there.
-      optional_id        = '',
-      optional_css_style = ''
-    )
-    s2(i, css_class, optional_id, optional_css_style)
-    br
-  end; alias command cmd # === command
-       alias cmd1    cmd # === cmd1
-
-  # ========================================================================= #
-  # === cmd3
-  # ========================================================================= #
-  def cmd3(
-      i = '', optional_css = command3?, optional_id = ''
-    )
-    padl3em(i, optional_css, optional_id) # The second argument here is the id.
-  end; alias rc3      cmd3 # === rc3
-       alias command3 cmd3 # === command3
-
-  # ========================================================================= #
-  # === cmd4
-  # ========================================================================= #
-  def cmd4(i = '', optional_id = '')
-    marl4em(i, '', optional_id) # The second argument here is the id.
-  end; alias rc4 cmd4 # === rc4
-
-  # ========================================================================= #
-  # === cmd5
-  # ========================================================================= #
-  def cmd5(i = '', optional_id = '')
-    marl5em(i, '', optional_id) # The second argument here is the id.
-  end; alias rc5 cmd5 # === rc5
-
 end # (end tag)
 
   # ========================================================================= #
@@ -219,13 +114,6 @@ end # (end tag)
     ::Cyberweb::PredefinedMethods.hash_registered_extra_tags?
   end
 
-  # ========================================================================= #
-  # === Cyberweb.css_for_cmd?
-  # ========================================================================= #
-  def self.css_for_cmd?
-    ::Cyberweb.internal_hash?[:cmd1]
-  end
-
   # ========================================================================= #
   # === Cyberweb.enable_predefined_methods
   #

data/lib/cyberweb/project/project.rb

@@ -14,6 +14,13 @@
 # =========================================================================== #
 module Cyberweb
 
+  # ========================================================================= #
+  # === Cyberweb::RUBY_SITE_DIR
+  #
+  # This will expand towards "/usr/lib/ruby/site_ruby/3.2.0/".
+  # ========================================================================= #
+  RUBY_SITE_DIR = RbConfig::CONFIG['sitelibdir'].to_s+'/'
+
   # ========================================================================= #
   # === PROJECT_BASE_DIR                                        (project tag)
   #

data/lib/cyberweb/requires/require_the_cyberweb_project.rb

@@ -154,4 +154,6 @@ require 'cyberweb/utility_scripts/images_to_html/images_to_html.rb'
 
 # Include the SimpleForum as well:
 require 'cyberweb/cybersprawl/simple_forum/simple_forum.rb'
- 
+
+# Next the new Cmd class:
+require 'cyberweb/cmd/cmd.rb'

data/lib/cyberweb/toplevel_methods/css.rb

@@ -15,6 +15,9 @@ module Cyberweb
 
   # ========================================================================= #
   # === Cyberweb.return_css_for_the_simple_calculator
+  #
+  # This is the CSS that handles the simple calculator. This calculator
+  # can be easily embedded "into" a given webpage.
   # ========================================================================= #
   def self.return_css_for_the_simple_calculator(
       font_size_to_use         = '16px',