moved module dependencies

apps/common/Analytics.js

@@ -35,22 +35,23 @@ if (Common === undefined)
 
 Common.component = Common.component || {};
 
-Common.Analytics = Common.component.Analytics = new(function() {
-    var _category;
+define(['jquery'], function($){
+    Common.Analytics = Common.component.Analytics = new(function() {
+        var _category;
 
-    return {
-        initialize: function(id, category) {
+        return {
+            initialize: function(id, category) {
 
-            if (typeof id === 'undefined')
-                throw 'Analytics: invalid id.';
+                if (typeof id === 'undefined')
+                    throw 'Analytics: invalid id.';
 
-            if (typeof category === 'undefined' || Object.prototype.toString.apply(category) !== '[object String]')
-                throw 'Analytics: invalid category type.';
+                if (typeof category === 'undefined' || Object.prototype.toString.apply(category) !== '[object String]')
+                    throw 'Analytics: invalid category type.';
 
-            _category = category;
+                _category = category;
 
-            $('head').append(
-                '<script type="text/javascript">' +
+                $('head').append(
+                    '<script type="text/javascript">' +
                     'var _gaq = _gaq || [];' +
                     '_gaq.push(["_setAccount", "' + id + '"]);' +
                     '_gaq.push(["_trackPageview"]);' +
@@ -60,27 +61,28 @@ Common.Analytics = Common.component.Analytics = new(function() {
                     'var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);' +
                     '})();' +
                     '</script>'
-            );
-        },
+                );
+            },
 
-        trackEvent: function(action, label, value) {
+            trackEvent: function(action, label, value) {
 
-            if (typeof action !== 'undefined' && Object.prototype.toString.apply(action) !== '[object String]')
-                throw 'Analytics: invalid action type.';
+                if (typeof action !== 'undefined' && Object.prototype.toString.apply(action) !== '[object String]')
+                    throw 'Analytics: invalid action type.';
 
-            if (typeof label !== 'undefined' && Object.prototype.toString.apply(label) !== '[object String]')
-                throw 'Analytics: invalid label type.';
+                if (typeof label !== 'undefined' && Object.prototype.toString.apply(label) !== '[object String]')
+                    throw 'Analytics: invalid label type.';
 
-            if (typeof value !== 'undefined' && !(Object.prototype.toString.apply(value) === '[object Number]' && isFinite(value)))
-                throw 'Analytics: invalid value type.';
+                if (typeof value !== 'undefined' && !(Object.prototype.toString.apply(value) === '[object Number]' && isFinite(value)))
+                    throw 'Analytics: invalid value type.';
 
-            if (typeof _gaq === 'undefined')
-                return;
+                if (typeof _gaq === 'undefined')
+                    return;
 
-            if (_category === 'undefined')
-                throw 'Analytics is not initialized.';
+                if (_category === 'undefined')
+                    throw 'Analytics is not initialized.';
 
-            _gaq.push(['_trackEvent', _category, action, label, value]);
+                _gaq.push(['_trackEvent', _category, action, label, value]);
+            }
         }
-    }
-})();
+    })();
+});
\ No newline at end of file

apps/common/mobile/utils/extendes.js

@@ -39,44 +39,45 @@
  *
  */
 
-(function() {
+define(
+    ['jquery','underscore','framework7'],
+    function () {
+        //Extend jQuery functions
+        jQuery.fn.extend( {
+            single: function(types, selector, data, fn) {
+                return this.off(types, fn).on(types, selector, data, fn);
+            }
+        });
 
-    //Extend jQuery functions
-    jQuery.fn.extend( {
-        single: function(types, selector, data, fn) {
-            return this.off(types, fn).on(types, selector, data, fn);
-        }
-    });
+        //Extend Dom7 functions
+        var methods = ['addClass', 'toggleClass', 'removeClass'];
 
-    //Extend Dom7 functions
-    var methods = ['addClass', 'toggleClass', 'removeClass'];
+        _.each(methods, function (method, index) {
+            var originalMethod = Dom7.fn[method];
 
-    _.each(methods, function (method, index) {
-        var originalMethod = Dom7.fn[method];
+            Dom7.fn[method] = function(className) {
+                var result = originalMethod.apply(this, arguments);
+                this.trigger(method, className);
+                return result;
+            };
+        });
 
-        Dom7.fn[method] = function(className) {
-            var result = originalMethod.apply(this, arguments);
-            this.trigger(method, className);
-            return result;
-        };
-    });
+        //Extend Underscope functions
+        _.buffered = function(func, buffer, scope, args) {
+            var timerId;
 
-    //Extend Underscope functions
-    _.buffered = function(func, buffer, scope, args) {
-        var timerId;
+            return function() {
+                var callArgs = args || Array.prototype.slice.call(arguments, 0),
+                    me = scope || this;
 
-        return function() {
-            var callArgs = args || Array.prototype.slice.call(arguments, 0),
-                me = scope || this;
+                if (timerId) {
+                    clearTimeout(timerId);
+                }
 
-            if (timerId) {
-                clearTimeout(timerId);
-            }
-
-            timerId = setTimeout(function(){
-                func.apply(me, callArgs);
-            }, buffer);
+                timerId = setTimeout(function(){
+                    func.apply(me, callArgs);
+                }, buffer);
+            };
         };
-    };
-
-})();
+    }
+);
\ No newline at end of file