Changeset 552 for trunk/js

Timestamp:

Nov 25, 2015 7:29:35 PM (8 years ago)

Author:

anonymous

Message:

Updated js.

Location:

trunk/js

Files:

• Msg.js (modified) (4 diffs)
• Utilities.js (modified) (2 diffs)

trunk/js/Msg.js

@@ -45 +45 @@
 ---------------------------------------------------------------------
 */
-Strangecode.Msg = function(options) {
+Strangecode.Msg = function (options) {
     // Merge options with defaults
     this.o = $.extend({
-        container: '#sc-msg:last',
+        container: '.sc-msg:last',
         above_msg: '',
         gotohash: true
@@ -64 +64 @@
 * @since    18 Mar 2014 23:24:15
 */
-Strangecode.Msg.prototype.raise = function(message, msg_class) {
+Strangecode.Msg.prototype.raise = function (message, msg_class) {
     // If an "above msg" is provided, and one doesn't already exist, add it to the message box.
     if (this.o.above_msg.length && !$(this.o.container).find('.sc-above').length) {
@@ -73 +73 @@
     // Append this raised message to the sc-msg stack, if it doesn't exist already.
     if (!$(this.o.container).find(':contains("' + message + '")').length) {
-        $(this.o.container).append($('<div class="sc-js-msg ' + msg_class + '"></div>').text(message)).show();
-        // $(this.o.container).append($('<div data-alert class="alert-box sc-js-msg ' + msg_class + '"></div>').hide().text(message).append('<a href="#" class="close">×</a>'));
-        // $('.sc-js-msg').slideDown('fast');
+        $(this.o.container).append($('<div data-alert class="alert-box sc-js-msg ' + msg_class + '"></div>').hide().html(message).append('<a href="#" class="close">×</a>'));
+        $('.sc-js-msg').slideDown('fast');
+        if ($.fn.foundation) {
+            $(document).foundation('reflow');
+        }
     }
 
@@ -86 +88 @@
 
 /*
-* Removes all messages previously created by Msg.raise.
+* Removes all previously raised messages. By default, only messages raised by this JS class
+* are cleared (matching class="sc-js-msg"), but you can clear *all* messages by assigning a more general
+* class (e.g., "sc-msg-error").
 *
 * @access   public
 * @param    string message  The message to display.
-* @param    string class    The class to apply to the message div (when using codebase CSS, it is useful to use one of: sc-msg-success, sc-msg-notice, sc-msg-warning, sc-msg-error)
+* @param    string class    Remove message divs matching this class (default: sc-js-msg; or use one of: sc-msg-success, sc-msg-notice, sc-msg-warning, sc-msg-error)
 * @author   Quinn Comendant <quinn@strangecode.com>
-* @version  1.0
+* @version  1.1
 * @since    18 Mar 2014 23:24:15
 */
-Strangecode.Msg.prototype.clear = function() {
-    // Append this raised message to the sc-msg stack.
-    var msg_class = (typeof msg_class === 'undefined') ? 'sc-msg-error' : msg_class;
-    $(this.o.container).find('.sc-js-msg').remove();
+Strangecode.Msg.prototype.clear = function (msg_class) {
+    var msg_class = (typeof msg_class === 'undefined') ? 'sc-js-msg' : msg_class;
+    $(this.o.container).find('.' + msg_class).remove();
 };

trunk/js/Utilities.js

@@ -70 +70 @@
 
 /*
-* Encode/decode HTML by proxying content via an in-memory div, setting its inner text which jQuery automatically encodes.
+* Encode html entities by specific mapping table.
+* Decode HTML by proxying content via an in-memory div, setting its inner text which jQuery automatically encodes.
 Then we pull the encoded contents back out. The div never exists on the page.
 ---------------------------------------------------------------------
-$('select').append($('<option>', {
-    value: value,
-    text: Strangecode.htmlEncode(text)
-}));
+$('input').val(Strangecode.htmlEncode(string));
 ---------------------------------------------------------------------
-*
-* @access   public
-* @version  1.1
-* @since    30 Jun 2013
+
+@access   public
+@version  2.0
+@since    30 Jun 2013
 */
-Strangecode.htmlEncode = function(text) {
-    return $('<div/>').text(text).html();
+Strangecode.htmlEncode = function (str) {
+    var entityMap = {
+        '&': '&amp;',
+        '<': '&lt;',
+        '>': '&gt;',
+        '"': '&quot;',
+        "'": '&#39;',
+        '/': '&#x2F;',
+        '`': '&DiacriticalGrave;'
+    };
+    return String(str).replace(/[&<>"'\/`]/g, function (s) {
+        return entityMap[s];
+    });
 };
-Strangecode.htmlDecode = function(text) {
-    return $('<div/>').html(value).text();
+Strangecode.htmlDecode = function (str) {
+    return $('<div>').html(str).text();
 };
 
 
 /*
-* Returns a string with URL-unsafe characters removed.
+Returns a string with URL-unsafe characters removed.
 ---------------------------------------------------------------------
 var urlslug = $('.url').val().slug();
@@ -109 +118 @@
     return str.replace(/[^a-z0-9 -]/g, '').replace(/\s+/g, '-').replace(/-+/g, '-');
 };
+
+
+
+/*
+Remove rounding errors caused by representation of finite binary floating point numbers.
+---------------------------------------------------------------------
+> (.1*.2)
+0.020000000000000004
+> (.1*.2).trim()
+0.02
+---------------------------------------------------------------------
+* @access   public
+* @version  1.0
+* @since    24 Nov 2015
+*/
+if (!Number.prototype.trim) {
+    Number.prototype.trim = function (precision) {
+        var precision = precision || 11;
+        return Math.round(this * Math.pow(10, precision)) / Math.pow(10, precision);
+    };
+}
+
+/*
+Uppercase the first letter of string.
+---------------------------------------------------------------------
+> 'hello world'.trim()
+Hello world
+---------------------------------------------------------------------
+* @access   public
+* @version  1.0
+* @since    24 Nov 2015
+*/
+if (!String.prototype.ucfirst) {
+    String.prototype.ucfirst = function() {
+        return this.charAt(0).toUpperCase() + this.slice(1);
+    };
+}
+