Merge lp:~daker/ubuntu-html5-theme/fix.1240682 into lp:~ubuntu-html5-theme-devs/ubuntu-html5-theme/ambiance

[Adnane Belmadiaf]

Space instead of tab

[Kyle Nitzsche (knitzsche)]

Hi Adnane: I think list.js still uses tabs.

review: Needs Fixing

[lp:~daker/ubuntu-html5-theme/fix.1240682]

89. By Adnane Belmadiaf on 2013-10-30

Fixed list.js

[Kyle Nitzsche (knitzsche)]

thanks

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file '0.1/ambiance/js/buttons.js'
--- 0.1/ambiance/js/buttons.js	2013-10-03 21:36:44 +0000
+++ 0.1/ambiance/js/buttons.js	2013-10-30 20:52:23 +0000
@@ -5,18 +5,18 @@
  * This file is part of ubuntu-html5-theme.
  *
  * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 3 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 3 of the
  * License, or
  * (at your option) any later version.
- 
+
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- 
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this program. If not, see 
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
 
@@ -27,9 +27,9 @@
 
 Button.prototype = {
     click: function (callback) {
-	if ( ! document.getElementById(this.id)) {
-	    throw "Invalid button ID: " + String(this.id);
-	}
+    if ( ! document.getElementById(this.id)) {
+        throw "Invalid button ID: " + String(this.id);
+    }
         new FastButton(document.getElementById(this.id), callback);
     }
 };

=== modified file '0.1/ambiance/js/list.js'
--- 0.1/ambiance/js/list.js	2013-10-21 14:02:06 +0000
+++ 0.1/ambiance/js/list.js	2013-10-30 20:52:23 +0000
@@ -5,18 +5,18 @@
  * This file is part of ubuntu-html5-theme.
  *
  * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 3 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 3 of the
  * License, or
  * (at your option) any later version.
- 
+
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- 
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this program. If not, see 
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
 
@@ -24,142 +24,140 @@
 var List = (function () {
     var LIST_DATA_ROLE = 'list';
 
-    var __addUlIfNotFound = function(list) {
-	if (list) {
-	    var uls = list.querySelectorAll('ul');
-	    if (uls == null || uls.length == 0) {
-		var ul = document.createElement('ul');
-		list.appendChild(ul);
-	    }
-	}
+    var __addUlIfNotFound = function (list) {
+        if (list) {
+            var uls = list.querySelectorAll('ul');
+            if (uls == null || uls.length == 0) {
+                var ul = document.createElement('ul');
+                list.appendChild(ul);
+            }
+        }
     };
 
     var List = function (selector) {
-	var list = document.querySelector(selector);
-	if (list == null || list.nodeName.toLowerCase() !== 'section' || list.getAttribute('data-role') != LIST_DATA_ROLE) {
-	    throw new Error('Element with selector "' + selector + '" does not exist or not declared as a "list" <section>');
-	}
-	this._list = list;
+        var list = document.querySelector(selector);
+        if (list == null || list.nodeName.toLowerCase() !== 'section' || list.getAttribute('data-role') != LIST_DATA_ROLE) {
+            throw new Error('Element with selector "' + selector + '" does not exist or not declared as a "list" <section>');
+        }
+        this._list = list;
 
-	__addUlIfNotFound(this._list);
+        __addUlIfNotFound(this._list);
     };
 
     List.prototype = {
-	setHeader: function (text) {
-	    if (typeof(text) == 'string') {
-		var header = this._list.querySelectorAll('header');
-		if (header) {
-		    if (header.length > 1) {
-			// more than one <header> detected
-			throw new Error("More than one <header> tag detected");
-		    }
-		    if (header.length == 1)
-			header = header[0];
-		    else
-			header = null;
-		}
-
-		if (!header)
-		    header = document.createElement('header');
-
-		header.innerText = text;
-	    }
-	},
-	/*
-	  \brief Appends a item to the list
-	  
-	  Appends a given item to the current list.
-	  
-	  \param text A string of text (images & custom html not supported at the moment)
-	  \param onclick (optional) A function callback that is to be called when the item is clicked.
-	                 It will be called with the clicked node as a parameter along with the value of
-			 user_data (if any).
-	  \param id (optional) An optional Id for the added node, the id will only be added if it does not already
-	                       conflict with another one.
+        setHeader: function (text) {
+            if (typeof (text) == 'string') {
+                var header = this._list.querySelectorAll('header');
+                if (header) {
+                    if (header.length > 1) {
+                        // more than one <header> detected
+                        throw new Error("More than one <header> tag detected");
+                    }
+                    if (header.length == 1)
+                        header = header[0];
+                    else
+                        header = null;
+                }
+
+                if (!header)
+                    header = document.createElement('header');
+
+                header.innerText = text;
+            }
+        },
+        /*
+      \brief Appends a item to the list
+
+      Appends a given item to the current list.
+
+      \param text A string of text (images & custom html not supported at the moment)
+      \param onclick (optional) A function callback that is to be called when the item is clicked.
+                     It will be called with the clicked node as a parameter along with the value of
+             user_data (if any).
+      \param id (optional) An optional Id for the added node, the id will only be added if it does not already
+                           conflict with another one.
           \param user_data (optional) An javascript entity that will be passed to the onclick callback (if any)
-	                              when the event has been trigger.
-	  \return added item node or null
-	 */
-	append: function (text, label, id, onclick, user_data) {
-	    var li = document.createElement('li');
-	    var a = document.createElement('a');
-
-	    a.setAttribute('href', '#');
-	    if (onclick && typeof(onclick) == 'function') {
-		li.addEventListener('click', function(event) {
-		    onclick(event ? event.target : null, user_data);
-		    if (event)
-			event.preventDefault();
-		});
-	    }
-	    //FIXME: no real checks on text content
-	    a.innerText = text;
-	    li.appendChild(a);
-
-	    if (label && typeof(label) == 'string') {
-		var n = document.createElement('label');
-		n.innerText = label;
-		li.appendChild(n);
-	    }
-
-	    if (id && typeof(id) == 'string') {
-		if ( ! document.getElementById(id))
-		    li.setAttribute('id', id);
-	    }
-	    this._list.querySelector('ul').appendChild(li);
-
-	    return li;
-	},
-	/*
-	  \brief returns the nth child item from a list
-	  
-	  \param index Index of the child to return (0 based number)
-	  \return selected item node or null
-	 */
-	at: function (index) {
-	    if (typeof(index) != 'number')
-		return null;
-	    return this._list.querySelector('ul').querySelector('li:nth-child(' + index + ')');
-	},
-	/*
-	  \brief removes the nth child item from a list
-	  
-	  \param index Index of the child to remove (0 based number)
-	  \return nothing
-	 */
-	remove: function (index) {
-	    var item = this.at(index);
-	    if (item) {
-		item.parentNode.removeChild(item);
-	    }
-	},
-	/*
-	  \brief removes all the child items from a list
-	  \return nothing
-	 */
-	removeAllItems: function() {
-	    if (this._list.querySelector('ul'))
-		this._list.querySelector('ul').innerHTML = '';
-	},
-	/*
-	  \brief iterator over the list of list items and calls a function on each one
-	  
-	  \param func function to be called for each list item. The function
-	              receives the DOM node associated with the current item along with its
-		      index.
-	  \return nothing
-	*/
-	forEach: function (func) {
-	    if (typeof(func) !== 'function')
-		return;
-	    var items = this._list.querySelector('ul').querySelectorAll('li');
-	    Array.prototype.forEach.call(items, function (element, index) {
-		func(element, index);
-	    });
-	},
+                                  when the event has been trigger.
+      \return added item node or null
+     */
+        append: function (text, label, id, onclick, user_data) {
+            var li = document.createElement('li');
+            var a = document.createElement('a');
+
+            a.setAttribute('href', '#');
+            if (onclick && typeof (onclick) == 'function') {
+                li.addEventListener('click', function (event) {
+                    onclick(event ? event.target : null, user_data);
+                    if (event)
+                        event.preventDefault();
+                });
+            }
+            //FIXME: no real checks on text content
+            a.innerText = text;
+            li.appendChild(a);
+
+            if (label && typeof (label) == 'string') {
+                var n = document.createElement('label');
+                n.innerText = label;
+                li.appendChild(n);
+            }
+
+            if (id && typeof (id) == 'string') {
+                if (!document.getElementById(id))
+                    li.setAttribute('id', id);
+            }
+            this._list.querySelector('ul').appendChild(li);
+
+            return li;
+        },
+        /*
+      \brief returns the nth child item from a list
+
+      \param index Index of the child to return (0 based number)
+      \return selected item node or null
+     */
+        at: function (index) {
+            if (typeof (index) != 'number')
+                return null;
+            return this._list.querySelector('ul').querySelector('li:nth-child(' + index + ')');
+        },
+        /*
+      \brief removes the nth child item from a list
+
+      \param index Index of the child to remove (0 based number)
+      \return nothing
+     */
+        remove: function (index) {
+            var item = this.at(index);
+            if (item) {
+                item.parentNode.removeChild(item);
+            }
+        },
+        /*
+      \brief removes all the child items from a list
+      \return nothing
+     */
+        removeAllItems: function () {
+            if (this._list.querySelector('ul'))
+                this._list.querySelector('ul').innerHTML = '';
+        },
+        /*
+      \brief iterator over the list of list items and calls a function on each one
+
+      \param func function to be called for each list item. The function
+                  receives the DOM node associated with the current item along with its
+              index.
+      \return nothing
+    */
+        forEach: function (func) {
+            if (typeof (func) !== 'function')
+                return;
+            var items = this._list.querySelector('ul').querySelectorAll('li');
+            Array.prototype.forEach.call(items, function (element, index) {
+                func(element, index);
+            });
+        },
     };
 
     return List;
-}) ();
-
-
+})();
\ No newline at end of file

=== modified file '0.1/ambiance/js/pagestacks.js'
--- 0.1/ambiance/js/pagestacks.js	2013-07-19 00:08:53 +0000
+++ 0.1/ambiance/js/pagestacks.js	2013-10-30 20:52:23 +0000
@@ -5,113 +5,113 @@
  * This file is part of ubuntu-html5-theme.
  *
  * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as 
- * published by the Free Software Foundation; either version 3 of the 
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 3 of the
  * License, or
  * (at your option) any later version.
- 
+
  * This package is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- 
- * You should have received a copy of the GNU Lesser General Public 
- * License along with this program. If not, see 
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program. If not, see
  * <http://www.gnu.org/licenses/>.
  */
 
 /* Pagestack */
+
 var Pagestack = (function () {
-    
+
     function __safeCall(f, args, errorfunc) {
-	if (typeof(f) !== 'function')
-	    return;
-	try {
-	    f.apply(null, args);
-	}
-	catch(e) { if (errorfunc && typeof(errorfunc) === 'function') errorfunc(e) }
+        if (typeof (f) !== 'function')
+            return;
+        try {
+            f.apply(null, args);
+        } catch (e) {
+            if (errorfunc && typeof (errorfunc) === 'function') errorfunc(e)
+        }
     };
 
-    function Pagestack () {
-	this._pages = [];
+    function Pagestack() {
+        this._pages = [];
     };
 
     Pagestack.prototype = {
-	__setAllPagesVisibility: function (visible) {
-	    var visibility = visible ? "block" : "none";
-	    [].forEach.call(document.querySelectorAll("[data-role='pagestack'] [data-role='page']"), function(el) {
-		el.style.display = visibility;
-
-		// treat footers separately
-		var footer = el.querySelector('footer');
-		if (footer)
-		    footer.style.display = visibility;
-	    });
-	},
-	__isPage: function (element) {
-	    return element.getAttribute('data-role') === 'page';
-	},
-	__deactivate: function (id) {
-	    if (!id || typeof(id) !== 'string')
-		return;
-	    var page = document.getElementById(id);
-	    if ( ! this.__isPage(page)) {
-		return;
-	    }
-	    page.style.display = "none";
-	    if (page.querySelector('footer')) {
-		var footer = page.querySelector('footer');
-		footer.style.display = 'none';
-		footer.classList.remove('revealed');
-	    }
-	},
-	__activate: function (id) {
-	    if (!id || typeof(id) !== 'string')
-		return;
-	    var page = document.getElementById(id);
-	    if ( ! this.__isPage(page)) {
-		return;
-	    }
-	    page.style.display = "block";
-	    if (page.querySelector('footer')) {
-		var footer = page.querySelector('footer');
-		footer.style.display = 'block';
-		footer.classList.add('revealed');
-	    }
-	},
-	push: function (id, properties) {
-	    try {
-		__safeCall(this.__setAllPagesVisibility.bind(this), [false]);
-
-		this.__activate(id);
-		this._pages.push(id);
-	    }
-	    catch(e) {}
-	},
-	isEmpty: function () {
-	    return this._pages.length === 0;
-	},
-	currentPage: function () {
-	    return this.isEmpty() ? null : this._pages[this._pages.length-1];
-	},
-	depth: function() {
-	    return this._pages.length;
-	},
-	clear: function() {
-	    if (this.isEmpty())
-		return;
-	    __safeCall(this.__deactivate.bind(this), [this.currentPage()]);
-	    this._pages = [];
-	},
-	pop: function() {
-	    if(this.isEmpty())
-		return;
-	    __safeCall(this.__deactivate.bind(this), [this.currentPage()]);
-	    this._pages.pop();
-	    __safeCall(this.__activate.bind(this), [this.currentPage()]);
-	}
+        __setAllPagesVisibility: function (visible) {
+            var visibility = visible ? "block" : "none";
+            [].forEach.call(document.querySelectorAll("[data-role='pagestack'] [data-role='page']"), function (el) {
+                el.style.display = visibility;
+
+                // treat footers separately
+                var footer = el.querySelector('footer');
+                if (footer)
+                    footer.style.display = visibility;
+            });
+        },
+        __isPage: function (element) {
+            return element.getAttribute('data-role') === 'page';
+        },
+        __deactivate: function (id) {
+            if (!id || typeof (id) !== 'string')
+                return;
+            var page = document.getElementById(id);
+            if (!this.__isPage(page)) {
+                return;
+            }
+            page.style.display = "none";
+            if (page.querySelector('footer')) {
+                var footer = page.querySelector('footer');
+                footer.style.display = 'none';
+                footer.classList.remove('revealed');
+            }
+        },
+        __activate: function (id) {
+            if (!id || typeof (id) !== 'string')
+                return;
+            var page = document.getElementById(id);
+            if (!this.__isPage(page)) {
+                return;
+            }
+            page.style.display = "block";
+            if (page.querySelector('footer')) {
+                var footer = page.querySelector('footer');
+                footer.style.display = 'block';
+                footer.classList.add('revealed');
+            }
+        },
+        push: function (id, properties) {
+            try {
+                __safeCall(this.__setAllPagesVisibility.bind(this), [false]);
+
+                this.__activate(id);
+                this._pages.push(id);
+            } catch (e) {}
+        },
+        isEmpty: function () {
+            return this._pages.length === 0;
+        },
+        currentPage: function () {
+            return this.isEmpty() ? null : this._pages[this._pages.length - 1];
+        },
+        depth: function () {
+            return this._pages.length;
+        },
+        clear: function () {
+            if (this.isEmpty())
+                return;
+            __safeCall(this.__deactivate.bind(this), [this.currentPage()]);
+            this._pages = [];
+        },
+        pop: function () {
+            if (this.isEmpty())
+                return;
+            __safeCall(this.__deactivate.bind(this), [this.currentPage()]);
+            this._pages.pop();
+            __safeCall(this.__activate.bind(this), [this.currentPage()]);
+        }
     }
 
     return Pagestack;
-})();
-    
+})();
\ No newline at end of file