corrade-nucleus-nucleons – Diff between revs 42 and 43

Subversion Repositories:

?pathlinks?

Rev 42 – Details – Blame – Last modification – View Log

Only display areas with differences – Regard whitespace

 // Load the window manager desktop icons.
 function loadWindowManagerIcons(path) {
     // 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)
             states = JSON.parse(cookie);
         $.each(nucleons, function(index, file) {
             // Skip files starting with full stop (POSIX).
             if (/^\./.test(file)) return;
             $.get(path + '/' + file, function(data) {
                 data = $(data).get(0);
                 var nucleon = data.getAttribute('data-target');
                 if(typeof states[nucleon] !== 'undefined') {
                     var sx = states[nucleon].x,
                         sy = states[nucleon].y;
                     data.style.webkitTransform =
                         data.style.transform =
                         'translate(' + sx + 'px, ' + sy + 'px)';
                     // Update the position attributes
                     data.setAttribute('data-x', sx);
                     data.setAttribute('data-y', sy);
                     $('#window-manager-desktop').append(data);
                     return;
+                }
                 // Translate the desktop icons so they do not overlap.
                 data.style.webkitTransform =
                   data.style.transform =
                   'translate(' + ix + 'px, ' + iy + 'px)';
                 // Update the position attributes
                 data.setAttribute('data-x', ix);
                 data.setAttribute('data-y', iy);
                 $('#window-manager-desktop').append(data);
                 // Translate by the desktop icon size.
                 ix += 64;
             });
         });
     });
+}
 // Open a window manager window.
 function openWindowManagerWindow(nucleon) {
     // If the nucleon already exists, then do not append the content again.
     if($('#' + nucleon).length)
         return;
     // Store the icon.
     var nucleon_icon = $('#' + nucleon + '-window-manager-button-icon').attr('src');
     // Change the nucleon icon to a loading icon.
     $('#' + nucleon + '-window-manager-button-icon').attr('src', '/img/loader.gif');
     // Disable button for successive clicks.
     $('#' + nucleon + '-window-manager-button').prop('disabled', true);
     // Load the nucleon.
     $.get('/' + nucleon + '/index.html', function(data) {
         // Get the DOM object.
         data = $(data).get(0);
         // 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)
                 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)
                 return;
             nucleonScripts[src].remove();
         });
         // Restore windows to their saved position.
         var cookie = Cookies.get('window-manager-windows');
         if(cookie) {
             var states = JSON.parse(cookie);
             if(typeof states[nucleon] !== 'undefined') {
                 var x = states[nucleon].x,
                     y = states[nucleon].y,
                     wm = $(data).find('.window-manager-window').get(0);
                 if(typeof wm !== 'undefined') {
                     wm.style.webkitTransform =
                         wm.style.transform =
                         'translate(' + x + 'px, ' + y + 'px)';
                     // Update the position attributes
                     wm.setAttribute('data-x', x);
                     wm.setAttribute('data-y', y);
+            }
+        }
-        }
         $(data).hide().appendTo('#window-manager-desktop').fadeIn(750);
     }).done(function(data) {
         // Change the nucleon icon back.
         $('#' + nucleon + '-window-manager-button-icon').attr('src', nucleon_icon);
         // Enable the button.
         $('#' + nucleon + '-window-manager-button').prop('disabled', false);
     });
+}
 // 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')
                 return parseInt($(e).css('z-index')) || 1;
         })
     );
+}
 // Draggable and moveable windows.
 $(document).ready(() => {
     // Window manager windows.
     interact('.window-manager-window')
         .draggable({
             // enable inertial throwing
             inertia: true,
             // keep the element within the area of it's parent
             restrict: {
                   restriction: $('#window-manager-desktop').get(0),
                   endOnly: true,
                   elementRect: { top: 0, left: 0, bottom: 1, right: 1 }
             },
             // enable autoScroll
             autoScroll: true,
             onmove: dragMoveListener,
             onend: function (event) {
                 event.target.style.opacity = 1;
-                // Save the window position.
-                var states = {};
-                var cookie = Cookies.get('window-manager-windows');
-                if(cookie)
-                    states = JSON.parse(cookie);
-                $('.window-manager-window').each(function(i, wm) {
-                    states[$(wm).data('target')] = {
-                        x: $(wm).data('x'),
-                        y: $(wm).data('y')
-                    };
-                });
-                Cookies.set('window-manager-windows', states, { path: '' });
             },
             onstart: function(event) {
                 // Move windows to top on drag.
                 event.target.style.zIndex = getTopWindowIndex() + 1;
                 event.target.style.opacity = 0.5;
+            }
         })
         .allowFrom('.panel-heading');
     // Window manager icons.
     interact('.window-manager-icon')
         .draggable({
             // enable inertial throwing
             inertia: false,
             // keep the element within the area of it's parent
             restrict: {
                   restriction: $('#window-manager-desktop').get(0),
                   endOnly: true,
                   elementRect: { top: 0, left: 0, bottom: 1, right: 1 }
             },
             snap: {
                   targets: [
                     interact.createSnapGrid({ x: 64, y: 64 })
                   ],
                   range: Infinity,
                   relativePoints: [ { x: 0, y: 0 } ]
             },
             // enable autoScroll
             autoScroll: true,
             onmove: dragMoveListener,
             onend: function (event) {
                 event.target.style.opacity = 1;
-                // Save the icon position.
-                var states = {};
-                var cookie = Cookies.get('window-manager-icons');
-                if(cookie)
-                    states = JSON.parse(cookie);
-                $('.window-manager-icon').each(function(i, wm) {
-                    states[$(wm).data('target')] = {
-                        x: $(wm).data('x'),
-                        y: $(wm).data('y')
-                    };
-                });
-                Cookies.set('window-manager-icons', states, { path: '' });
             },
             onstart: function(event) {
                 event.target.style.opacity = 0.5;
+            }
         });
     // Closing windows.
     $(document).on('click', '.window-manager-close-button', function(event) {
         var wm = $('#' + $(this).data('target'));
         wm.fadeOut(750, function() {
             wm.remove();
         });
     });
     // Windows clicking brings to front.
     $(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;
 });
 Generated by GNU Enscript 1.6.5.90.