From 5762397f874a628829ab93d6b27543811989c03b Mon Sep 17 00:00:00 2001 From: xcyxiner <593091948@qq.com> Date: Thu, 15 Dec 2016 10:02:18 +0800 Subject: [PATCH 1/4] Update pop.js js format error in node v0.10 --- web-server/public/js/pop.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web-server/public/js/pop.js b/web-server/public/js/pop.js index 3a34cfe..9f0f7b0 100755 --- a/web-server/public/js/pop.js +++ b/web-server/public/js/pop.js @@ -1,4 +1,4 @@ - (function($j) { +jQuery(function($j) { $j.positionFixed = function(el) { $j(el).each(function() { new fixed(this) @@ -73,7 +73,7 @@ } } }) -})(jQuery) +}) jQuery(function($j) { $j('#footer').positionFixed() @@ -111,4 +111,4 @@ Pop.prototype = { $('#pop').remove(); }); } -} \ No newline at end of file +} From 95573567069b9c6e085c64668ca74ad6a40e00c6 Mon Sep 17 00:00:00 2001 From: xcyxiner <593091948@qq.com> Date: Thu, 15 Dec 2016 10:46:28 +0800 Subject: [PATCH 2/4] Update index.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去掉pop.js合并到client.js --- web-server/public/index.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web-server/public/index.html b/web-server/public/index.html index c26e7ac..f2333ba 100755 --- a/web-server/public/index.html +++ b/web-server/public/index.html @@ -18,9 +18,6 @@ - @@ -95,4 +92,4 @@

- \ No newline at end of file + From 1cbed16cea5a36d75ab2c47324f83306f621250d Mon Sep 17 00:00:00 2001 From: xcyxiner <593091948@qq.com> Date: Thu, 15 Dec 2016 10:47:50 +0800 Subject: [PATCH 3/4] Delete pop.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并pop.js到client.js中，解决Pop无法找到的问题 --- web-server/public/js/pop.js | 114 ------------------------------------ 1 file changed, 114 deletions(-) delete mode 100755 web-server/public/js/pop.js diff --git a/web-server/public/js/pop.js b/web-server/public/js/pop.js deleted file mode 100755 index 9f0f7b0..0000000 --- a/web-server/public/js/pop.js +++ /dev/null @@ -1,114 +0,0 @@ -jQuery(function($j) { - $j.positionFixed = function(el) { - $j(el).each(function() { - new fixed(this) - }) - return el; - } - $j.fn.positionFixed = function() { - return $j.positionFixed(this) - } - var fixed = $j.positionFixed.impl = function(el) { - var o = this; - o.sts = { - target: $j(el).css('position', 'fixed'), - container: $j(window) - } - o.sts.currentCss = { - top: o.sts.target.css('top'), - right: o.sts.target.css('right'), - bottom: o.sts.target.css('bottom'), - left: o.sts.target.css('left') - } - if (!o.ie6) return; - o.bindEvent(); - } - $j.extend(fixed.prototype, { - ie6: $.browser.msie && $.browser.version < 7.0, - bindEvent: function() { - var o = this; - o.sts.target.css('position', 'absolute') - o.overRelative().initBasePos(); - o.sts.target.css(o.sts.basePos) - o.sts.container.scroll(o.scrollEvent()).resize(o.resizeEvent()); - o.setPos(); - }, - overRelative: function() { - var o = this; - var relative = o.sts.target.parents().filter(function() { - if ($j(this).css('position') == 'relative') return this; - }) - if (relative.size() > 0) relative.after(o.sts.target) - return o; - }, - initBasePos: function() { - var o = this; - o.sts.basePos = { - top: o.sts.target.offset().top - (o.sts.currentCss.top == 'auto' ? o.sts.container.scrollTop() : 0), - left: o.sts.target.offset().left - (o.sts.currentCss.left == 'auto' ? o.sts.container.scrollLeft() : 0) - } - return o; - }, - setPos: function() { - var o = this; - o.sts.target.css({ - top: o.sts.container.scrollTop() + o.sts.basePos.top, - left: o.sts.container.scrollLeft() + o.sts.basePos.left - }) - }, - scrollEvent: function() { - var o = this; - return function() { - o.setPos(); - } - }, - resizeEvent: function() { - var o = this; - return function() { - setTimeout(function() { - o.sts.target.css(o.sts.currentCss) - o.initBasePos(); - o.setPos() - }, 1) - } - } - }) -}) - -jQuery(function($j) { - $j('#footer').positionFixed() -}) - -function Pop(title, intro) { - this.title = title; - this.intro = intro; - this.apearTime = 1000; - this.hideTime = 500; - this.delay = 8000; - this.addInfo(); - this.showDiv(); - this.closeDiv(); -} -Pop.prototype = { - addInfo: function() { - $("#popIntro").html(this.intro); - }, - showDiv: function(time) { - if (!($.browser.msie && ($.browser.version == "6.0") && !$.support.style)) { - $('#pop').slideDown(this.apearTime).delay(this.delay).fadeOut(400); - } else { - $('#pop').show(); - jQuery(function($j) { - $j('#pop').positionFixed() - }) - } - }, - closeDiv: function() { - $("#popClose").click(function() { - $('#pop').hide(); - }); - $("#popMore").click(function() { - $('#pop').remove(); - }); - } -} From a826153765f4749316c13d3981ef2ec06067846a Mon Sep 17 00:00:00 2001 From: xcyxiner <593091948@qq.com> Date: Thu, 15 Dec 2016 10:49:40 +0800 Subject: [PATCH 4/4] Update client.js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合并Pop.js到该文件中，防止没找到该文件Pop.js导致的，添加用户或者更新用户提示失败（var pop=new Pop(title, tip);） --- web-server/public/js/client.js | 120 ++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 2 deletions(-) diff --git a/web-server/public/js/client.js b/web-server/public/js/client.js index 1aaa460..313dfe4 100755 --- a/web-server/public/js/client.js +++ b/web-server/public/js/client.js @@ -92,7 +92,8 @@ function tip(type, name) { title = 'Message Notify'; break; } - var pop=new Pop(title, tip); + //合并Pop.js到该文件中，防止没找到该文件 +var pop=new Pop(title, tip); }; // init user list @@ -270,4 +271,119 @@ $(document).ready(function() { }); } }); -}); \ No newline at end of file +}); + +jQuery(function($j) { + $j.positionFixed = function(el) { + $j(el).each(function() { + new fixed(this) + }) + return el; + } + $j.fn.positionFixed = function() { + return $j.positionFixed(this) + } + var fixed = $j.positionFixed.impl = function(el) { + var o = this; + o.sts = { + target: $j(el).css('position', 'fixed'), + container: $j(window) + } + o.sts.currentCss = { + top: o.sts.target.css('top'), + right: o.sts.target.css('right'), + bottom: o.sts.target.css('bottom'), + left: o.sts.target.css('left') + } + if (!o.ie6) return; + o.bindEvent(); + } + $j.extend(fixed.prototype, { + ie6: $.browser.msie && $.browser.version < 7.0, + bindEvent: function() { + var o = this; + o.sts.target.css('position', 'absolute') + o.overRelative().initBasePos(); + o.sts.target.css(o.sts.basePos) + o.sts.container.scroll(o.scrollEvent()).resize(o.resizeEvent()); + o.setPos(); + }, + overRelative: function() { + var o = this; + var relative = o.sts.target.parents().filter(function() { + if ($j(this).css('position') == 'relative') return this; + }) + if (relative.size() > 0) relative.after(o.sts.target) + return o; + }, + initBasePos: function() { + var o = this; + o.sts.basePos = { + top: o.sts.target.offset().top - (o.sts.currentCss.top == 'auto' ? o.sts.container.scrollTop() : 0), + left: o.sts.target.offset().left - (o.sts.currentCss.left == 'auto' ? o.sts.container.scrollLeft() : 0) + } + return o; + }, + setPos: function() { + var o = this; + o.sts.target.css({ + top: o.sts.container.scrollTop() + o.sts.basePos.top, + left: o.sts.container.scrollLeft() + o.sts.basePos.left + }) + }, + scrollEvent: function() { + var o = this; + return function() { + o.setPos(); + } + }, + resizeEvent: function() { + var o = this; + return function() { + setTimeout(function() { + o.sts.target.css(o.sts.currentCss) + o.initBasePos(); + o.setPos() + }, 1) + } + } + }) +}) + +jQuery(function($j) { + $j('#footer').positionFixed() +}) + +function Pop(title, intro) { + this.title = title; + this.intro = intro; + this.apearTime = 1000; + this.hideTime = 500; + this.delay = 8000; + this.addInfo(); + this.showDiv(); + this.closeDiv(); +} +Pop.prototype = { + addInfo: function() { + $("#popIntro").html(this.intro); + }, + showDiv: function(time) { + if (!($.browser.msie && ($.browser.version == "6.0") && !$.support.style)) { + $('#pop').slideDown(this.apearTime).delay(this.delay).fadeOut(400); + } else { + $('#pop').show(); + jQuery(function($j) { + $j('#pop').positionFixed() + }) + } + }, + closeDiv: function() { + $("#popClose").click(function() { + $('#pop').hide(); + }); + $("#popMore").click(function() { + $('#pop').remove(); + }); + } +}