was.wm.js – Diff between revs 1 and 4

Subversion Repositories:

?pathlinks?

Rev 1 – Rev 7 – Go to most recent revision – Details – Blame – Last modification – View Log

     // Search and load all nucleons.
     $.get(path, function(nucleons) {
         var ix = 0, iy = 0;
         var states = {};
         var cookie = Cookies.get('window-manager-icons');
-        if(cookie)
+        if(cookie) {
             states = JSON.parse(cookie);
+        }
         $.each(nucleons, function(index, file) {
             // Skip files starting with full stop (POSIX).
-            if (/^\./.test(file)) return;
+            if (/^\./.test(file)) {
+                return;
+            }
             $.get(path + '/' + file, function(data) {
                 data = $(data).get(0);
                 var nucleon = data.getAttribute('data-target');
+}
 // Open a window manager window.
 function openWindowManagerWindow(nucleon) {
     // If the nucleon already exists, then do not append the content again.
-    if($('#' + nucleon).length)
+    if($('#' + nucleon).length) {
+        return;
         return;
     // Store the icon.
         // Select all new scripts that have to be inserted into the DOM.
         var nucleonScripts = [];
         $(data).find('script').each(function() {
             var src = $(this).attr('src');
-            if(src === undefined)
+            if(src === undefined) {
+                return;
                 return;
             nucleonScripts[src] = $(this);
         });
         // Remove scripts from the nucleon if they are already added to the DOM.
         $(document).find('script').each(function() {
             var src = $(this).attr('src');
-            if(nucleonScripts[src] === undefined)
+            if(nucleonScripts[src] === undefined) {
+                return;
                 return;
             nucleonScripts[src].remove();
         });
 // Retrieve the top-most window manager window z-index.
 function getTopWindowIndex() {
     return Math.max.apply(null,
         $.map($('.window-manager-window'), function(e, n) {
-            if ($(e).css('position') != 'static')
+            if ($(e).css('position') !== 'static') {
+                return parseInt($(e).css('z-index')) || 1;
                 return parseInt($(e).css('z-index')) || 1;
         })
     );
+}
+// Draggable and moveable windows.
+$(document).ready(() => {
+    function dragMoveListener (event) {
+        var target = event.target, states, cookie,
+          // keep the dragged position in the data-x/data-y attributes
+          x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
+          y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
+        // translate the element
+        target.style.webkitTransform =
+          target.style.transform =
+          'translate(' + x + 'px, ' + y + 'px)';
+        // update the position attributes
+        target.setAttribute('data-x', x);
+        target.setAttribute('data-y', y);
+        if(target.classList.contains('window-manager-window')) {
+            // Save the window position.
+            states = {};
+            cookie = Cookies.get('window-manager-windows');
+            if(cookie) {
+                states = JSON.parse(cookie);
+            }
+            states[$(event.target).data('target')] = {
+                x: x,
+                y: y
+            };
+            Cookies.set('window-manager-windows', states, { path: '' });
+        }
+        if(target.classList.contains('window-manager-icon')) {
+            // Save the icon position.
+            states = {};
+            cookie = Cookies.get('window-manager-icons');
+            if(cookie) {
+                states = JSON.parse(cookie);
+            }
+            states[$(event.target).data('target')] = {
+                x: x,
+                y: y
+            };
+            Cookies.set('window-manager-icons', states, { path: '' });
+        }
 // Draggable and moveable windows.
 $(document).ready(() => {
     // Window manager windows.
     interact('.window-manager-window')
         .draggable({
     $(document).on('click', '.window-manager-window', function(event) {
         $(event.target)
             .closest('.window-manager-window')
             .css('z-index', getTopWindowIndex() + 1);
     });
-    function dragMoveListener (event) {
-        var target = event.target,
-          // keep the dragged position in the data-x/data-y attributes
-          x = (parseFloat(target.getAttribute('data-x')) || 0) + event.dx,
-          y = (parseFloat(target.getAttribute('data-y')) || 0) + event.dy;
-        // translate the element
-        target.style.webkitTransform =
-          target.style.transform =
-          'translate(' + x + 'px, ' + y + 'px)';
-        // update the position attributes
-        target.setAttribute('data-x', x);
-        target.setAttribute('data-y', y);
-        if(target.classList.contains('window-manager-window')) {
-            // Save the window position.
-            var states = {};
-            var cookie = Cookies.get('window-manager-windows');
-            if(cookie)
-                states = JSON.parse(cookie);
-            states[$(event.target).data('target')] = {
-                x: x,
-                y: y
-            };
-            Cookies.set('window-manager-windows', states, { path: '' });
-        }
-        if(target.classList.contains('window-manager-icon')) {
-            // Save the icon position.
-            var states = {};
-            var cookie = Cookies.get('window-manager-icons');
-            if(cookie)
-                states = JSON.parse(cookie);
-            states[$(event.target).data('target')] = {
-                x: x,
-                y: y
-            };
-            Cookies.set('window-manager-icons', states, { path: '' });
-        }
-    }
     // this is used later in the resizing and gesture demos
     window.dragMoveListener = dragMoveListener;