-
Notifications
You must be signed in to change notification settings - Fork 112
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/tryToUseWebpack'
- Loading branch information
Showing
49 changed files
with
7,412 additions
and
3,074 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,6 @@ results | |
| .project | ||
| .idea/ | ||
| npm-debug.log | ||
| sys/node_modules/ | ||
| node_modules | ||
| web/topic/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "name": "multi-page", | ||
| "version": "1.0.0", | ||
| "description": "blog's administrator project", | ||
| "main": "app.js", | ||
| "scripts": { | ||
| "dev": "fis3 release -wd ../../static/", | ||
| "production": "fis3 release production -d ../../static/" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/bh-lay/blog.git" | ||
| }, | ||
| "keywords": [ | ||
| "bh-lay", | ||
| "blog" | ||
| ], | ||
| "author": "剧中人[bh-lay.com]", | ||
| "license": "ISC", | ||
| "bugs": { | ||
| "url": "https://github.com/bh-lay/blog/issues" | ||
| }, | ||
| "homepage": "https://github.com/bh-lay/blog#readme" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| { | ||
| "name": "multi-page", | ||
| "version": "1.0.0", | ||
| "description": "blog's multi page project", | ||
| "main": "null", | ||
| "scripts": { | ||
| "dev": "fis3 release -wd ../../static/", | ||
| "production": "fis3 release production -d ../../static/" | ||
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "git+https://github.com/bh-lay/blog.git" | ||
| }, | ||
| "keywords": [ | ||
| "bh-lay", | ||
| "blog" | ||
| ], | ||
| "author": "剧中人[bh-lay.com]", | ||
| "license": "ISC", | ||
| "bugs": { | ||
| "url": "https://github.com/bh-lay/blog/issues" | ||
| }, | ||
| "homepage": "https://github.com/bh-lay/blog#readme" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,30 @@ | ||
| define([ | ||
| 'js/Base', | ||
| 'js/juicer' | ||
| ],function(utils,juicer){ | ||
| var face_config = 'smile grinning smiley blush relaxed wink heart_eyes kissing_heart kissing_heart kissing flushed grin pensive relieved cry scream angry mask tired_face sleeping hushed smirk 1 -1 two_men_holding_hands heart broken_heart gun'; | ||
| var face_tpl = ['<div class="face_list">{@each list as it}', | ||
| '<a href="javascript:void(0)" title="${it}"><span class="emoji s_${it}"></span></a>', | ||
| '{@/each}</div>'].join(''); | ||
|
|
||
| function face(param){ | ||
| var html = ''; | ||
| var config_arr = face_config.split(/\s/); | ||
| var html = juicer(face_tpl,{ | ||
| list: config_arr | ||
| }); | ||
| import utils from "../js/Base.js"; | ||
| import juicer from "../js/juicer.js"; | ||
| import UI from "../js/dialog.js"; | ||
|
|
||
| var pop = UI.pop({ | ||
| title: '贱萌的emoji表情', | ||
| top: param.top, | ||
| left: param.left, | ||
| width: 300, | ||
| html : html | ||
| }); | ||
| utils.bind(pop.cntDom,'click','a',function(){ | ||
| param.onSelect && param.onSelect(this.getAttribute('title')); | ||
| pop.close(); | ||
| }); | ||
| } | ||
| return face; | ||
| }); | ||
| var face_config = 'smile grinning smiley blush relaxed wink heart_eyes kissing_heart kissing_heart kissing flushed grin pensive relieved cry scream angry mask tired_face sleeping hushed smirk 1 -1 two_men_holding_hands heart broken_heart gun'; | ||
| var face_tpl = ['<div class="face_list">{@each list as it}', | ||
| '<a href="javascript:void(0)" title="${it}"><span class="emoji s_${it}"></span></a>', | ||
| '{@/each}</div>'].join(''); | ||
|
|
||
| function face(param){ | ||
| var html = ''; | ||
| var config_arr = face_config.split(/\s/); | ||
| var html = juicer(face_tpl,{ | ||
| list: config_arr | ||
| }); | ||
|
|
||
| var pop = UI.pop({ | ||
| title: '贱萌的emoji表情', | ||
| top: param.top, | ||
| left: param.left, | ||
| width: 300, | ||
| html : html | ||
| }); | ||
| utils.bind(pop.cntDom,'click','a',function(){ | ||
| param.onSelect && param.onSelect(this.getAttribute('title')); | ||
| pop.close(); | ||
| }); | ||
| } | ||
| export default face; |
Oops, something went wrong.